Passage à ZF 2.x ; modifications minimales pour le supporter.

Module.php

@@ -6,6 +6,7 @@ use UnicaenApp\Mouchard\MouchardServiceFactory;
 use UnicaenApp\Mvc\Listener\MaintenanceListener;
 use UnicaenApp\Options\ModuleOptions;
 use Zend\EventManager\EventInterface;
+use Zend\Http\Request as HttpRequest;
 use Zend\ServiceManager\ServiceManager;
 use Zend\ModuleManager\Feature\AutoloaderProviderInterface;
 use Zend\ModuleManager\Feature\BootstrapListenerInterface;
@@ -91,9 +92,12 @@ class Module implements
 
         $eventManager = $application->getEventManager();
 
-        // Correction pour passer à zendframework/zend-mvc 2.7 sans douleur.
         /** @var HttpExceptionStrategy|ConsoleExceptionStrategy $baseExceptionStrategy */
-        $baseExceptionStrategy = $services->get('ExceptionStrategy');
+        if ($e->getRequest() instanceof HttpRequest) {
+            $baseExceptionStrategy = $services->get('HttpExceptionStrategy');
+        } else {
+            $baseExceptionStrategy = $services->get('ConsoleExceptionStrategy');
+        }
         $exceptionStrategy = new ExceptionStrategy();
         $exceptionStrategy->setDisplayExceptions($baseExceptionStrategy->displayExceptions());
         $exceptionStrategy->attach($eventManager);

composer.json

@@ -3,22 +3,22 @@
     "description": "Module de base des applications unicaen",
     "require": {
         "php":                                  ">=5.6 || >=7.0",
-        "zendframework/zend-http":              "2.4.* || ^2.4",
-        "zendframework/zend-mvc":               "2.4.* || ^2.4",
-        "zendframework/zend-eventmanager":      "2.4.* || ^2.4",
-        "zendframework/zend-servicemanager":    "2.4.* || ^2.4",
-        "zendframework/zend-view":              "2.4.* || ^2.4",
-        "zendframework/zend-mail":              "2.4.* || ^2.4",
-        "zendframework/zend-session":           "2.4.* || ^2.4",
-        "zendframework/zend-i18n":              "2.4.* || ^2.4",
-        "zendframework/zend-navigation":        "2.4.* || ^2.4",
-        "zendframework/zend-version":           "2.4.* || ^2.4",
-        "zendframework/zend-ldap":              "2.4.* || ^2.4",
-        "zendframework/zend-log":               "2.4.* || ^2.4",
-        "zendframework/zend-console":           "2.4.* || ^2.4",
-        "zendframework/zend-config":            "2.4.* || ^2.4",
-        "zendframework/zend-serializer":        "2.4.* || ^2.4",
-        "zendframework/zend-json":              "2.4.* || ^2.4",
+        "zendframework/zend-http":              "^2.4",
+        "zendframework/zend-mvc":               "^2.4",
+        "zendframework/zend-eventmanager":      "^2.4",
+        "zendframework/zend-servicemanager":    "^2.4",
+        "zendframework/zend-view":              "^2.4",
+        "zendframework/zend-mail":              "^2.4",
+        "zendframework/zend-session":           "^2.4",
+        "zendframework/zend-i18n":              "^2.4",
+        "zendframework/zend-navigation":        "^2.4",
+        "zendframework/zend-version":           "^2.4",
+        "zendframework/zend-ldap":              "^2.4",
+        "zendframework/zend-log":               "^2.4",
+        "zendframework/zend-console":           "^2.4",
+        "zendframework/zend-config":            "^2.4",
+        "zendframework/zend-serializer":        "^2.4",
+        "zendframework/zend-json":              "^2.4",
         "rwoverdijk/assetmanager":              ">=1.3",
         "doctrine/doctrine-orm-module":         "~1.0",
         "mpdf/mpdf":                            "v6.1.3"

config/module.config.php

@@ -4,6 +4,7 @@ namespace UnicaenApp;
 
 use UnicaenApp\Service\Mailer\MailerService;
 use UnicaenApp\Service\Mailer\MailerServiceFactory;
+use UnicaenApp\ServiceManager\ServiceLocatorAwareInitializer;
 
 return [
     'asset_manager'   => [
@@ -276,6 +277,7 @@ return [
 //            'UnicaenApp\Service\Doctrine\MultipleDbAbstractFactory',
         ],
         'initializers'       => [
+            ServiceLocatorAwareInitializer::class,
             'UnicaenApp\Service\EntityManagerAwareInitializer',
         ],
         'aliases' => [
@@ -336,6 +338,7 @@ return [
         ],
         'initializers' => [
             'UnicaenApp\Service\EntityManagerAwareInitializer',
+            ServiceLocatorAwareInitializer::class,
         ],
     ],
     'translator'      => [

src/UnicaenApp/Controller/Plugin/MessengerPlugin.php

@@ -4,7 +4,7 @@ namespace UnicaenApp\Controller\Plugin;
 use UnicaenApp\Traits\MessageAwareInterface;
 use UnicaenApp\Traits\MessageAwareTrait;
 use UnicaenApp\View\Helper\Messenger as MessengerViewHelper;
-use Zend\ServiceManager\ServiceLocatorAwareInterface;
+use UnicaenApp\ServiceManager\ServiceLocatorAwareInterface;
 use Zend\ServiceManager\ServiceLocatorAwareTrait;
 use Zend\Mvc\Controller\Plugin\AbstractPlugin;
 

src/UnicaenApp/Controller/Plugin/Upload/UploaderPlugin.php

@@ -5,7 +5,7 @@ namespace UnicaenApp\Controller\Plugin\Upload;
 use UnicaenApp\Util;
 use Zend\Form\FormElementManager;
 use Zend\Mvc\Controller\Plugin\AbstractPlugin;
-use Zend\ServiceManager\ServiceLocatorAwareInterface;
+use UnicaenApp\ServiceManager\ServiceLocatorAwareInterface;
 use Zend\ServiceManager\ServiceLocatorAwareTrait;
 use Zend\View\Model\JsonModel;
 

src/UnicaenApp/Form/AbstractForm.php

@@ -6,7 +6,7 @@ use Zend\Form\Form;
 use Zend\Http\Request;
 use Zend\InputFilter\InputFilterProviderInterface;
 use Zend\Mvc\Controller\Plugin\FlashMessenger;
-use Zend\ServiceManager\ServiceLocatorAwareInterface;
+use UnicaenApp\ServiceManager\ServiceLocatorAwareInterface;
 use Zend\ServiceManager\ServiceLocatorAwareTrait;
 
 

src/UnicaenApp/ORM/Event/Listeners/HistoriqueListener.php

@@ -9,7 +9,7 @@ use Doctrine\ORM\Events;
 use RuntimeException;
 use UnicaenApp\Entity\HistoriqueAwareInterface;
 use UnicaenAuth\Entity\Db\AbstractUser;
-use Zend\ServiceManager\ServiceLocatorAwareInterface;
+use UnicaenApp\ServiceManager\ServiceLocatorAwareInterface;
 use Zend\ServiceManager\ServiceLocatorAwareTrait;
 
 /**

src/UnicaenApp/Service/InstadiaService.php

@@ -4,7 +4,7 @@ namespace UnicaenApp\Service;
 
 use UnicaenApp\Entity\Db\Instadia;
 use UnicaenAuth\Entity\Db\AbstractUser;
-use Zend\ServiceManager\ServiceLocatorAwareInterface;
+use UnicaenApp\ServiceManager\ServiceLocatorAwareInterface;
 use Zend\ServiceManager\ServiceLocatorAwareTrait;
 
 /**

src/UnicaenApp/Service/MessageCollector.php

@@ -2,7 +2,7 @@
 
 namespace UnicaenApp\Service;
 
-use Zend\ServiceManager\ServiceLocatorAwareInterface;
+use UnicaenApp\ServiceManager\ServiceLocatorAwareInterface;
 
 /**
  * Description of MessageCollector

src/UnicaenApp/Service/MessageCollectorAwareTrait.php

@@ -3,7 +3,7 @@
 namespace UnicaenApp\Service;
 
 use UnicaenApp\Exception\RuntimeException;
-use Zend\ServiceManager\ServiceLocatorAwareInterface;
+use UnicaenApp\ServiceManager\ServiceLocatorAwareInterface;
 
 /**
  * Trait facilitant l'accès au service MessageCollector.

src/UnicaenApp/ServiceManager/ServiceLocatorAwareInitializer.php

+<?php
+
+namespace UnicaenApp\ServiceManager;
+
+use Zend\ServiceManager\InitializerInterface;
+use Zend\ServiceManager\ServiceLocatorInterface;
+
+/**
+ * Initializer provisoire permettant d'injecter le service locator dans n'importe quel service,
+ * pratique bannie dans ZF3.
+ *
+ * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
+ * @deprecated À abandonner, svp
+ */
+class ServiceLocatorAwareInitializer implements InitializerInterface
+{
+    /**
+     * Initialize
+     *
+     * @param mixed                   $instance
+     * @param ServiceLocatorInterface $serviceLocator
+     * @deprecated À abandonner, svp
+     */
+    public function initialize($instance, ServiceLocatorInterface $serviceLocator)
+    {
+        if (method_exists($serviceLocator, 'getServiceLocator')) {
+            $serviceLocator = $serviceLocator->getServiceLocator();
+        }
+        if ($instance instanceof ServiceLocatorAwareInterface) {
+            $instance->setServiceLocator($serviceLocator);
+        }
+    }
+}

src/UnicaenApp/ServiceManager/ServiceLocatorAwareInterface.php

+<?php
+
+namespace UnicaenApp\ServiceManager;
+
+use Zend\ServiceManager\ServiceLocatorInterface;
+
+/**
+ * Interface remplaçant provisoirement Zend\ServiceManager\ServiceLocatorAwareInterface qui
+ * dont l'usage déclenche un warning PHP car elle disparaît dans ZF3.
+ *
+ * @author Bertrand GAUTHIER <bertrand.gauthier at unicaen.fr>
+ * @deprecated À abandonner, svp
+ */
+interface ServiceLocatorAwareInterface
+{
+    /**
+     * Set service locator
+     *
+     * @param ServiceLocatorInterface $serviceLocator
+     * @deprecated À abandonner, svp
+     */
+    public function setServiceLocator(ServiceLocatorInterface $serviceLocator);
+
+    /**
+     * Get service locator
+     *
+     * @return ServiceLocatorInterface
+     * @deprecated À abandonner, svp
+     */
+    public function getServiceLocator();
+}

src/UnicaenApp/View/Helper/HeadLink.php

@@ -2,7 +2,7 @@
 
 namespace UnicaenApp\View\Helper;
 
-use Zend\ServiceManager\ServiceLocatorAwareInterface;
+use UnicaenApp\ServiceManager\ServiceLocatorAwareInterface;
 use Zend\ServiceManager\ServiceLocatorAwareTrait;
 use Zend\View\Helper\Placeholder\Container\AbstractContainer;
 
@@ -36,7 +36,7 @@ class HeadLink extends \Zend\View\Helper\HeadLink implements ServiceLocatorAware
      */
     protected function appendConfigStyles()
     {
-        $config = $this->getServiceLocator()->getServiceLocator()->get('config');
+        $config = $this->getServiceLocator()->get('config');
 
         $cacheEnabled = isset($config['public_files']['cache_enabled']) ? (boolean)$config['public_files']['cache_enabled'] : false;
         $version = isset($config['unicaen-app']['app_infos']['version']) ? $config['unicaen-app']['app_infos']['version'] : '';

src/UnicaenApp/View/Helper/HeadScript.php

@@ -2,7 +2,7 @@
 
 namespace UnicaenApp\View\Helper;
 
-use Zend\ServiceManager\ServiceLocatorAwareInterface;
+use UnicaenApp\ServiceManager\ServiceLocatorAwareInterface;
 use Zend\ServiceManager\ServiceLocatorAwareTrait;
 
 class HeadScript extends \Zend\View\Helper\InlineScript implements ServiceLocatorAwareInterface {
@@ -36,7 +36,7 @@ class HeadScript extends \Zend\View\Helper\InlineScript implements ServiceLocato
 
     protected function appendConfigScripts()
     {
-        $config = $this->getServiceLocator()->getServiceLocator()->get('config');
+        $config = $this->getServiceLocator()->get('config');
 
         $version = isset($config['unicaen-app']['app_infos']['version']) ? '?v='.$config['unicaen-app']['app_infos']['version'] : '';
 

src/UnicaenApp/View/Helper/InlineScript.php

@@ -2,7 +2,7 @@
 
 namespace UnicaenApp\View\Helper;
 
-use Zend\ServiceManager\ServiceLocatorAwareInterface;
+use UnicaenApp\ServiceManager\ServiceLocatorAwareInterface;
 use Zend\ServiceManager\ServiceLocatorAwareTrait;
 
 class InlineScript extends \Zend\View\Helper\InlineScript implements ServiceLocatorAwareInterface {
@@ -36,7 +36,7 @@ class InlineScript extends \Zend\View\Helper\InlineScript implements ServiceLoca
 
     protected function appendConfigScripts()
     {
-        $config = $this->getServiceLocator()->getServiceLocator()->get('config');
+        $config = $this->getServiceLocator()->get('config');
 
         $cacheEnabled = isset($config['public_files']['cache_enabled']) ? (boolean)$config['public_files']['cache_enabled'] : false;
         $version = isset($config['unicaen-app']['app_infos']['version']) ? $config['unicaen-app']['app_infos']['version'] : '';

src/UnicaenApp/View/Helper/InstadiaViewHelper.php

@@ -4,7 +4,7 @@ namespace UnicaenApp\View\Helper;
 
 use UnicaenApp\Service\Traits\InstadiaServiceAwareTrait;
 use Zend\View\Helper\AbstractHtmlElement;
-use Zend\ServiceManager\ServiceLocatorAwareInterface;
+use UnicaenApp\ServiceManager\ServiceLocatorAwareInterface;
 use Zend\ServiceManager\ServiceLocatorAwareTrait;
 
 /**

src/UnicaenApp/View/Helper/MessageCollectorHelper.php

@@ -3,7 +3,7 @@
 namespace UnicaenApp\View\Helper;
 
 use UnicaenApp\Service\MessageCollector;
-use Zend\ServiceManager\ServiceLocatorAwareInterface;
+use UnicaenApp\ServiceManager\ServiceLocatorAwareInterface;
 use Zend\ServiceManager\ServiceLocatorAwareTrait;
 use Zend\View\Helper\AbstractHelper;
 use Zend\View\Renderer\PhpRenderer;
@@ -103,7 +103,7 @@ class MessageCollectorHelper extends AbstractHelper implements ServiceLocatorAwa
     private function getMessageCollectorService()
     {
         if ($this->messageCollectorService == null) {
-            $this->messageCollectorService = $this->getServiceLocator()->getServiceLocator()->get('MessageCollector');
+            $this->messageCollectorService = $this->getServiceLocator()->get('MessageCollector');
         }
 
         return $this->messageCollectorService;

src/UnicaenApp/View/Helper/QueryParams.php

@@ -3,7 +3,7 @@
 namespace UnicaenApp\View\Helper;
 
 use Zend\Http\Request;
-use Zend\ServiceManager\ServiceLocatorAwareInterface;
+use UnicaenApp\ServiceManager\ServiceLocatorAwareInterface;
 use Zend\ServiceManager\ServiceLocatorAwareTrait;
 use Zend\View\Helper\AbstractHelper;
 

src/UnicaenApp/View/Helper/Upload/UploaderHelper.php

@@ -5,7 +5,7 @@ namespace UnicaenApp\View\Helper\Upload;
 use UnicaenApp\Controller\Plugin\Upload\UploadedFileInterface;
 use UnicaenApp\Controller\Plugin\Upload\UploaderPlugin;
 use UnicaenApp\Controller\Plugin\Upload\UploadForm;
-use Zend\ServiceManager\ServiceLocatorAwareInterface;
+use UnicaenApp\ServiceManager\ServiceLocatorAwareInterface;
 use Zend\ServiceManager\ServiceLocatorAwareTrait;
 use Zend\View\Helper\AbstractHelper;
 use Zend\View\HelperPluginManager;