Commit c61a0b53 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Migration vers laminas

parent 810fbcc1

Module.php

+26 −26
Original line number Diff line number Diff line
@@ -9,24 +9,24 @@ use UnicaenApp\Mvc\Listener\MaintenanceListener; 
use UnicaenApp\Mvc\Listener\ModalListener;

use UnicaenApp\Mvc\View\Http\ExceptionStrategy;

use UnicaenApp\Options\ModuleOptions;

use Zend\Console\Adapter\AdapterInterface as Console;

use Zend\Console\Request as ConsoleRequest;

use Zend\EventManager\EventInterface;

use Zend\Http\Request as HttpRequest;

use Zend\Mvc\I18n\Translator;

use Zend\ModuleManager\Feature\AutoloaderProviderInterface;

use Zend\ModuleManager\Feature\BootstrapListenerInterface;

use Zend\ModuleManager\Feature\ConfigProviderInterface;

use Zend\ModuleManager\Feature\ControllerPluginProviderInterface;

use Zend\ModuleManager\Feature\ServiceProviderInterface;

use Zend\Mvc\Console\View\ExceptionStrategy as ConsoleExceptionStrategy;

use Zend\Mvc\View\Http\ExceptionStrategy as HttpExceptionStrategy;

use Zend\ServiceManager\ServiceManager;

use Zend\Session\Container;

use Zend\Session\SessionManager;

use Zend\Validator\AbstractValidator;

use Zend\View\Helper\Navigation;

use Zend\View\HelperPluginManager;

use Laminas\Console\Adapter\AdapterInterface as Console;

use Laminas\Console\Request as ConsoleRequest;

use Laminas\EventManager\EventInterface;

use Laminas\Http\Request as HttpRequest;

use Laminas\Mvc\I18n\Translator;

use Laminas\ModuleManager\Feature\AutoloaderProviderInterface;

use Laminas\ModuleManager\Feature\BootstrapListenerInterface;

use Laminas\ModuleManager\Feature\ConfigProviderInterface;

use Laminas\ModuleManager\Feature\ControllerPluginProviderInterface;

use Laminas\ModuleManager\Feature\ServiceProviderInterface;

use Laminas\Mvc\Console\View\ExceptionStrategy as ConsoleExceptionStrategy;

use Laminas\Mvc\View\Http\ExceptionStrategy as HttpExceptionStrategy;

use Laminas\ServiceManager\ServiceManager;

use Laminas\Session\Container;

use Laminas\Session\SessionManager;

use Laminas\Validator\AbstractValidator;

use Laminas\View\Helper\Navigation;

use Laminas\View\HelperPluginManager;



define('__VENDOR_DIR__', dirname(dirname(__DIR__)));
@@ -60,7 +60,7 @@ class Module implements 
    public function getAutoloaderConfig()

    {

        return array(

            'Zend\Loader\StandardAutoloader' => array(

            'Laminas\Loader\StandardAutoloader' => array(

                'namespaces' => array(

                    __NAMESPACE__ => __DIR__ . '/src/' . __NAMESPACE__,

                ),
@@ -76,9 +76,9 @@ class Module implements 
     * @see BootstrapListenerInterface

     * @return array

     */

    public function onBootstrap(EventInterface $e) /* @var $e \Zend\Mvc\MvcEvent */

    public function onBootstrap(EventInterface $e) /* @var $e \Laminas\Mvc\MvcEvent */

    {

        /* @var $application \Zend\Mvc\Application */

        /* @var $application \Laminas\Mvc\Application */

        $application = $e->getApplication();

        /* @var $services ServiceManager */

        $services    = $application->getServiceManager();
@@ -86,7 +86,7 @@ class Module implements 
        $this->bootstrapSession($e);



        // la locale par défaut est celle du service de traduction

        /** @var \Zend\I18n\Translator\Translator $translator */

        /** @var \Laminas\I18n\Translator\Translator $translator */

        $translator = $services->get('translator');

        Locale::setDefault($translator->getLocale());
@@ -111,7 +111,7 @@ class Module implements 
        $vhm = $services->get('ViewHelperManager');



        /* @var $nvh Navigation */

        $nvh = $vhm->get('Zend\View\Helper\Navigation');

        $nvh = $vhm->get('Laminas\View\Helper\Navigation');

        $nvh->setServiceLocator($services);

        // Déclaration des plugins maison pour l'aide de vue de navigation

        $invokables = array(
@@ -145,7 +145,7 @@ class Module implements 
    /**

     * Init session manager.

     *

     * @param \Zend\Mvc\MvcEvent $e

     * @param \Laminas\Mvc\MvcEvent $e

     */

    public function bootstrapSession($e)

    {
@@ -193,10 +193,10 @@ class Module implements 
    }



    /**

     * Expected to return \Zend\ServiceManager\Config object or array to

     * Expected to return \Laminas\ServiceManager\Config object or array to

     * seed such an object.

     *

     * @return array|\Zend\ServiceManager\Config

     * @return array|\Laminas\ServiceManager\Config

     */

    public function getControllerPluginConfig()

    {

bin/doctrine-module-em.php

+2 −2
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ 
 * <http://www.doctrine-project.org>.

 */



use Zend\ServiceManager\ServiceManager;

use Zend\Mvc\Application;

use Laminas\ServiceManager\ServiceManager;

use Laminas\Mvc\Application;



ini_set('display_errors', true);

chdir(__DIR__);

composer.json

+35 −34
Original line number Diff line number Diff line
@@ -10,33 +10,34 @@ 
        "doctrine/doctrine-orm-module": "*",

        "mpdf/mpdf": "^7.1 || ^8.0",

        "ocramius/proxy-manager": "^2.0",

        "zendframework/zend-config":                    "^3.2",

        "zendframework/zend-console":                   "^2.8",

        "zendframework/zend-eventmanager":              "^3.2",

        "zendframework/zend-form":                      "^2.14",

        "zendframework/zend-http":                      "^2.10",

        "zendframework/zend-i18n":                      "^2.9",

        "zendframework/zend-i18n-resources":            "^2.6",

        "zendframework/zend-json":                      "^2.6",

        "zendframework/zend-ldap":                      "^2.10",

        "zendframework/zend-log":                       "^2.10",

        "zendframework/zend-mail":                      "^2.10",

        "zendframework/zend-mvc":                       "^3.1",

        "zendframework/zend-mvc-console":               "^1.2",

        "zendframework/zend-mvc-i18n":                  "^1.1",

        "zendframework/zend-mvc-plugin-fileprg":        "^1.1",

        "zendframework/zend-mvc-plugin-flashmessenger": "^1.1",

        "zendframework/zend-mvc-plugin-identity":       "^1.1",

        "zendframework/zend-mvc-plugin-prg":            "^1.1",

        "zendframework/zend-navigation":                "^2.9",

        "zendframework/zend-serializer":                "^2.9",

        "zendframework/zend-servicemanager":            "^3.4",

        "zendframework/zend-session":                   "^2.8",

        "laminas/laminas-config": "^3.2",

        "laminas/laminas-console": "^2.8",

        "laminas/laminas-eventmanager": "^3.2",

        "laminas/laminas-form": "^2.14",

        "laminas/laminas-http": "^2.10",

        "laminas/laminas-i18n": "^2.9",

        "laminas/laminas-i18n-resources": "^2.6",

        "laminas/laminas-json": "^2.6",

        "laminas/laminas-ldap": "^2.10",

        "laminas/laminas-log": "^2.10",

        "laminas/laminas-mail": "^2.10",

        "laminas/laminas-mvc": "^3.1",

        "laminas/laminas-mvc-console": "^1.2",

        "laminas/laminas-mvc-i18n": "^1.1",

        "laminas/laminas-mvc-plugin-fileprg": "^1.1",

        "laminas/laminas-mvc-plugin-flashmessenger": "^1.1",

        "laminas/laminas-mvc-plugin-identity": "^1.1",

        "laminas/laminas-mvc-plugin-prg": "^1.1",

        "laminas/laminas-navigation": "^2.9",

        "laminas/laminas-serializer": "^2.9",

        "laminas/laminas-servicemanager": "^3.4",

        "laminas/laminas-session": "^2.8",

        "zendframework/zend-version": "^2.4",

        "zendframework/zend-view":                      "^2.11"

        "laminas/laminas-view": "^2.11",

        "laminas/laminas-dependency-plugin": "^2.1"

    },

    "require-dev": {

        "zendframework/zend-test":                      "^3.2",

        "laminas/laminas-test": "^3.2",

        "phpunit/phpunit": "^5.6"

    },

    "autoload": {

config/module.config.php

+4 −4
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ use UnicaenApp\View\Helper\Upload\UploaderHelper; 
use UnicaenApp\View\Helper\Upload\UploaderHelperFactory;

use UnicaenApp\View\Helper\UserProfileSelect;

use UnicaenApp\View\Helper\UserProfileSelectFactory;

use Zend\Mvc\Console\Router\Simple;

use Laminas\Mvc\Console\Router\Simple;



return [

    'router'          => [
@@ -290,10 +290,10 @@ return [ 
    ],

    'service_manager' => [

        'factories'          => [

            'translator'                  => 'Zend\I18n\Translator\TranslatorServiceFactory',

            'navigation'                  => 'Zend\Navigation\Service\DefaultNavigationFactory',

            'translator'                  => 'Laminas\I18n\Translator\TranslatorServiceFactory',

            'navigation'                  => 'Laminas\Navigation\Service\DefaultNavigationFactory',

            // service de gestion de la session

            'Zend\Session\SessionManager' => 'UnicaenApp\Session\SessionManagerFactory',

            'Laminas\Session\SessionManager' => 'UnicaenApp\Session\SessionManagerFactory',

            // service d'accès aux options de config de ce module

            'unicaen-app_module_options'  => 'UnicaenApp\Options\ModuleOptionsFactory',

            // mapper d'accès aux individus de l'annuaire LDAP

config/unicaen-app.global.php.dist

+3 −3
Original line number Diff line number Diff line
@@ -6,9 +6,9 @@ 
 * enlevez l'extension ".dist" et adaptez son contenu à vos besoins.

 */



use Zend\Session\Storage\SessionArrayStorage;

use Zend\Session\Validator\HttpUserAgent;

use Zend\Session\Validator\RemoteAddr;

use Laminas\Session\Storage\SessionArrayStorage;

use Laminas\Session\Validator\HttpUserAgent;

use Laminas\Session\Validator\RemoteAddr;



return [

    'unicaen-app' => [