Commit d35f201e authored by David Surville's avatar David Surville
Browse files

Merge branch 'laminas_migration' into release-1.2.0

# Conflicts:
#	config/merged/privilege.config.php
#	view/unicaen-privilege/privilege-categorie/index.phtml
parents 4bb7d91e 936608af
Loading
Loading
Loading
Loading
Loading
+7 −7
Original line number Diff line number Diff line
@@ -3,11 +3,11 @@

namespace UnicaenPrivilege;

use Zend\Mvc\ModuleRouteListener;
use Zend\Mvc\MvcEvent;
use Zend\Stdlib\ArrayUtils;
use Zend\Stdlib\Glob;
use Zend\Config\Factory as ConfigFactory;
use Laminas\Mvc\ModuleRouteListener;
use Laminas\Mvc\MvcEvent;
use Laminas\Stdlib\ArrayUtils;
use Laminas\Stdlib\Glob;
use Laminas\Config\Factory as ConfigFactory;

class Module
{
@@ -19,7 +19,7 @@ class Module
        $moduleRouteListener->attach($eventManager);

        /* Active un layout spécial si la requête est de type AJAX. Valable pour TOUS les modules de l'application. */
        $eventManager->getSharedManager()->attach('Zend\Mvc\Controller\AbstractActionController', 'dispatch',
        $eventManager->getSharedManager()->attach('Laminas\Mvc\Controller\AbstractActionController', 'dispatch',
            function (MvcEvent $e) {
                $request = $e->getRequest();
                if ($request instanceof HttpRequest && $request->isXmlHttpRequest()) {
@@ -47,7 +47,7 @@ class Module
    public function getAutoloaderConfig()
    {
        return array(
            'Zend\Loader\StandardAutoloader' => array(
            'Laminas\Loader\StandardAutoloader' => array(
                'namespaces' => array(
                    __NAMESPACE__ => __DIR__ . '/src/' . __NAMESPACE__,
                ),
+22 −21
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@
        }
    ],
    "require": {
    "unicaen/app": "^3.0"
        "unicaen/app": "^4.0.3",
        "laminas/laminas-dependency-plugin": "^2.1"
    },
    "require-dev": {
        "phpunit/phpunit": ">=3.7"
+2 −2
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ use UnicaenPrivilege\Service\Privilege\PrivilegeCategorieServiceFactory;
use UnicaenPrivilege\Service\Privilege\PrivilegeService;
use UnicaenPrivilege\Service\Privilege\PrivilegeServiceFactory;
use UnicaenPrivilege\View\Helper\Privilege\PrivilegeViewHelper;
use Zend\Router\Http\Literal;
use Zend\Router\Http\Segment;
use Laminas\Router\Http\Literal;
use Laminas\Router\Http\Segment;

return [

+5 −5
Original line number Diff line number Diff line
@@ -5,11 +5,11 @@ namespace UnicaenPrivilege\Assertion;
use BjyAuthorize\Service\Authorize;
use UnicaenAuthentification\Service\Traits\AuthorizeServiceAwareTrait;
use UnicaenAuthentification\Service\Traits\UserContextServiceAwareTrait;
use Zend\Mvc\MvcEvent;
use Zend\Permissions\Acl\Acl;
use Zend\Permissions\Acl\Assertion\AssertionInterface;
use Zend\Permissions\Acl\Resource\ResourceInterface;
use Zend\Permissions\Acl\Role\RoleInterface;
use Laminas\Mvc\MvcEvent;
use Laminas\Permissions\Acl\Acl;
use Laminas\Permissions\Acl\Assertion\AssertionInterface;
use Laminas\Permissions\Acl\Resource\ResourceInterface;
use Laminas\Permissions\Acl\Role\RoleInterface;

/**
 * Description of AbstractAssertion
+2 −2
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ use UnicaenPrivilege\Form\Privilege\CategorieFiltreFormAwareTrait;
use UnicaenPrivilege\Form\Privilege\CategorieFormAwareTrait;
use UnicaenPrivilege\Service\Privilege\PrivilegeCategorieServiceAwareTrait;
use UnicaenPrivilege\Service\Privilege\PrivilegeServiceAwareTrait;
use Zend\Mvc\Controller\AbstractActionController;
use Zend\View\Model\ViewModel;
use Laminas\Mvc\Controller\AbstractActionController;
use Laminas\View\Model\ViewModel;

class PrivilegeCategorieController extends AbstractActionController
{
Loading