Commit d6c125c0 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

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

 Conflicts:
	config/module.config.php
parents d13cc59a b91b4500
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@

namespace UnicaenTbl;

use Zend\ModuleManager\Feature\ConfigProviderInterface;
use Zend\Mvc\MvcEvent;
use Laminas\ModuleManager\Feature\ConfigProviderInterface;
use Laminas\Mvc\MvcEvent;

/**
 *
+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ return [
        ],
    ],

    'laminasdevelopertools' => [
    'laminas-developer-tools' => [
        'profiler' => [
            'collectors' => [
                Service\CollectorService::class => Service\CollectorService::class,
+3 −3
Original line number Diff line number Diff line
@@ -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;

/**
 *
+4 −4
Original line number Diff line number Diff line
@@ -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
     */
+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@

namespace UnicaenTbl\Options;

use Zend\Stdlib\AbstractOptions;
use Laminas\Stdlib\AbstractOptions;


/**
Loading