Commit 795b2816 authored by David Surville's avatar David Surville
Browse files

Merge branch 'laminas_migration' into release-1.2.0

parent d209c9a5
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@
    ],
    "require": {
        "unicaen/app": "^4.0",
        "laminas/laminas-dependency-plugin": "^2.1"
        "laminas/laminas-dependency-plugin": "^1.0"
    },
    "require-dev": {
        "phpunit/phpunit": ">=3.7"
+5 −5
Original line number Diff line number Diff line
@@ -4,11 +4,11 @@ namespace UnicaenUtilisateur\Form\User;

use UnicaenApp\Service\EntityManagerAwareTrait;
use UnicaenUtilisateur\Service\Role\RoleServiceAwareTrait;
use Zend\Form\Element\Button;
use Zend\Form\Element\Select;
use Zend\Form\Form;
use Zend\InputFilter\Factory;
use Zend\Validator\NotEmpty;
use Laminas\Form\Element\Button;
use Laminas\Form\Element\Select;
use Laminas\Form\Form;
use Laminas\InputFilter\Factory;
use Laminas\Validator\NotEmpty;

class UserRoleForm extends Form
{
+5 −5
Original line number Diff line number Diff line
@@ -4,11 +4,11 @@ namespace UnicaenUtilisateur\Form\User;

use UnicaenApp\Service\EntityManagerAwareTrait;
use UnicaenUtilisateur\Service\Role\RoleServiceAwareTrait;
use Zend\Form\Element\Button;
use Zend\Form\Element\Select;
use Zend\Form\Form;
use Zend\InputFilter\Factory;
use Zend\Validator\NotEmpty;
use Laminas\Form\Element\Button;
use Laminas\Form\Element\Select;
use Laminas\Form\Form;
use Laminas\InputFilter\Factory;
use Laminas\Validator\NotEmpty;

class UserRolePerimetreForm extends Form
{
+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ use UnicaenUtilisateur\Entity\Db\RoleInterface;
use UnicaenUtilisateur\Entity\Db\UserInterface;
use UnicaenUtilisateur\Provider\Identity\IdentityServiceAwareTrait;
use UnicaenUtilisateur\Provider\Privilege\UtilisateurPrivileges;
use Zend\View\Helper\AbstractHelper;
use Laminas\View\Helper\AbstractHelper;

class UserRole extends AbstractHelper
{
+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ namespace UnicaenUtilisateur\View\Helper;

use Psr\Container\ContainerInterface;
use UnicaenUtilisateur\Provider\Identity\IdentityService;
use Zend\ServiceManager\Factory\FactoryInterface;
use Laminas\ServiceManager\Factory\FactoryInterface;

class UserRoleFactory implements FactoryInterface
{