Merge branch 'laminas_migration' of https://git.unicaen.fr/lib/unicaen/tbl

 Conflicts:
	config/module.config.php

Module.php

@@ -2,8 +2,8 @@
 
 namespace UnicaenTbl;
 
-use Zend\ModuleManager\Feature\ConfigProviderInterface;
-use Zend\Mvc\MvcEvent;
+use Laminas\ModuleManager\Feature\ConfigProviderInterface;
+use Laminas\Mvc\MvcEvent;
 
 /**
  *

config/module.config.php

@@ -69,7 +69,7 @@ return [
         ],
     ],
 
-    'laminasdevelopertools' => [
+    'laminas-developer-tools' => [
         'profiler' => [
             'collectors' => [
                 Service\CollectorService::class => Service\CollectorService::class,

src/UnicaenTbl/Controller/AdminController.php

@@ -6,9 +6,9 @@ use UnicaenTbl\Form\Traits\ActualisationFormAwareTrait;
 use UnicaenTbl\Service\Traits\QueryGeneratorServiceAwareTrait;
 use UnicaenTbl\Service\Traits\SchemaServiceAwareTrait;
 use UnicaenTbl\Service\Traits\TableauBordServiceAwareTrait;
-use Zend\Http\Request;
-use Zend\Mvc\Controller\AbstractActionController;
-use Zend\View\Model\JsonModel;
+use Laminas\Http\Request;
+use Laminas\Mvc\Controller\AbstractActionController;
+use Laminas\View\Model\JsonModel;
 
 /**
  *

src/UnicaenTbl/Form/ActualisationForm.php

@@ -2,9 +2,9 @@
 
 namespace UnicaenTbl\Form;
 
-use Zend\Form\Form;
-use Zend\InputFilter\InputFilterProviderInterface;
-use Zend\Stdlib\Hydrator\HydratorInterface;
+use Laminas\Form\Form;
+use Laminas\InputFilter\InputFilterProviderInterface;
+use Laminas\Stdlib\Hydrator\HydratorInterface;
 
 
 /**
@@ -48,7 +48,7 @@ class ActualisationForm extends Form implements InputFilterProviderInterface
 
     /**
      * Should return an array specification compatible with
-     * {@link Zend\InputFilter\Factory::createInputFilter()}.
+     * {@link Laminas\InputFilter\Factory::createInputFilter()}.
      *
      * @return array
      */

src/UnicaenTbl/Options/ModuleOptions.php

@@ -2,7 +2,7 @@
 
 namespace UnicaenTbl\Options;
 
-use Zend\Stdlib\AbstractOptions;
+use Laminas\Stdlib\AbstractOptions;
 
 
 /**

src/UnicaenTbl/Service/CollectorService.php

@@ -3,8 +3,8 @@
 namespace UnicaenTbl\Service;
 
 use Serializable;
-use Zend\Mvc\MvcEvent;
-use ZendDeveloperTools\Collector\CollectorInterface;
+use Laminas\Mvc\MvcEvent;
+use Laminas\DeveloperTools\Collector\CollectorInterface;
 
 /**
  * Collecteur de données UnicaenCode

src/UnicaenTbl/Service/TableauBordService.php

@@ -4,8 +4,8 @@ namespace UnicaenTbl\Service;
 
 use UnicaenApp\Service\EntityManagerAwareTrait;
 use UnicaenTbl\Entity\TableauBord;
-use Zend\ServiceManager\ServiceLocatorAwareInterface;
-use Zend\ServiceManager\ServiceLocatorAwareTrait;
+use Laminas\ServiceManager\ServiceLocatorAwareInterface;
+use Laminas\ServiceManager\ServiceLocatorAwareTrait;
 
 /**
  * Description of TableauBordService

tests/Bootstrap.php

 <?php
 namespace UnicaenTblTest;
 
-use Zend\Loader\AutoloaderFactory;
-use Zend\Mvc\Service\ServiceManagerConfig;
-use Zend\ServiceManager\ServiceManager;
+use Laminas\Loader\AutoloaderFactory;
+use Laminas\Mvc\Service\ServiceManagerConfig;
+use Laminas\ServiceManager\ServiceManager;
 use RuntimeException;
 
 
@@ -61,19 +61,19 @@ class Bootstrap
                 $zf2Path = ZF2_PATH;
             } elseif (is_dir($vendorPath . '/ZF2/library')) {
                 $zf2Path = $vendorPath . '/ZF2/library';
-            } elseif (is_dir($vendorPath . '/zendframework/zendframework/library')) {
-                $zf2Path = $vendorPath . '/zendframework/zendframework/library';
+            } elseif (is_dir($vendorPath . '/laminas/laminas/library')) {
+                $zf2Path = $vendorPath . '/laminas/laminas/library';
             }
         }
 
         if (!$zf2Path) {
-            throw new RuntimeException('Unable to load ZF2. Run `php composer.phar install` or define a ZF2_PATH environment variable.');
+            throw new RuntimeException('Unable to load Laminas. Run `php composer.phar install` or define a ZF2_PATH environment variable.');
         }
 
-        include $zf2Path . '/Zend/Loader/AutoloaderFactory.php';
+        include $zf2Path . '/Laminas/Loader/AutoloaderFactory.php';
         AutoloaderFactory::factory(array(
-            'Zend\Loader\StandardAutoloader' => array(
-                'autoregister_zf' => true,
+            'Laminas\Loader\StandardAutoloader' => array(
+                'autoregister_laminas' => true,
                 'namespaces' => array(
                     __NAMESPACE__ => __DIR__ . '/' . __NAMESPACE__,
                 ),

tests/config/application.config.php

@@ -15,4 +15,4 @@ $testConfig = array(
     ),
 );
 
-return \Zend\Stdlib\ArrayUtils::merge($appConfig, $testConfig);
+return \Laminas\Stdlib\ArrayUtils::merge($appConfig, $testConfig);

view/zend-developer-tools/toolbar/unicaen-tbl.phtml → view/laminas-developer-tools/toolbar/unicaen-tbl.phtml

-<div class="zdt-toolbar-entry">
-    <div class="zdt-toolbar-preview">
-        <span class="zdt-toolbar-info">
-               <span class="zdt-toolbar-extra-info">
+<div class="laminas-toolbar-entry">
+    <div class="laminas-toolbar-preview">
+        <span class="laminas-toolbar-info">
+               <span class="laminas-toolbar-extra-info">
                     <img style="padding-bottom: 4px;"
                          src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACAElEQVR4AX1Sw8KcQRCsD+vYOgaPkH2G2LnHOMa2brFt56XiZBl8GP1Ta9dY1dXd49y6e22tkOqS5zgTHceBMQZsGhy1bYDWdm4bDEcNpRX3vthus2/Xz1csXZnOZrNIp9NokoAV7ZFbILEljWOBYqEw7f2nd699uwYvFX7/RiabQacKopOMc6oRcWzv5qCknOFrJfioq40Cj13XBSGlhB8EoRFSYOLEScjmsiTotD5AgUYYRiiVihCSBGGA9x/eYvac2Zg7bw4mTJiIIAjAACploJUCgyaFguMCP77/wP9//1GtVu2eJaD1tC1KKTx++BTJZJJW+lzhHhFFEfL5xW0XyEz4vo9FCxZix47dPKCf3Gu5EcUClH377g3u06EGge2acDwPR44eAlW1YsD9VgBdpFLJVlykFN0ESsY4feoseMGzZFTBORGEIX7bVD94cLfhHtPZoyCVTuP4yWMQIgafoUcBqCCZQOMIUvUQSKlw4dxF8EdSAaEUs6AR/P+PSqWC6zevdNxvZKEJpuzQkYNwrSXHaUfeoSt2LhhczwWIxvf2mcsmXGv17Olz9JH+t9LXVMAU3rx9HR2gC8KUy2Uw/55lP2yz4HtMk4ZWbQUwdQWzZs8G7xcKJWOFfnHWbVy3LJHwDlnr6YRVYBrfnU+5aMNwqTloJaG0KalY7x0DbYmBlWlA3zgAAAAASUVORK5CYII="/>
                     UnicaenTbl
             </span>
         </span>
     </div>
-    <div class="zdt-toolbar-detail">
-            <span class="zdt-toolbar-info">
-                <span class="zdt-detail-value">
+    <div class="laminas-toolbar-detail">
+            <span class="laminas-toolbar-info">
+                <span class="laminas-detail-value">
                     <a href="<?php echo $this->url('unicaen-tbl/build'); ?>">Construction des tableaux de bord</a>
                 </span>
             </span>