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

Corrections pour passer à ZF3.

parent 332177b0
Loading
Loading
Loading
Loading
+4 −1
Changes for src/BjyAuthorize/Guard/Controller.php: 4 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -102,6 +102,9 @@ class Controller extends AbstractGuard

        /* @var $app \Zend\Mvc\ApplicationInterface */
        $app = $event->getTarget();
        $app->getEventManager()->trigger(MvcEvent::EVENT_DISPATCH_ERROR, $event);

//        $app->getEventManager()->trigger(MvcEvent::EVENT_DISPATCH_ERROR, $event);
        $event->setName(MvcEvent::EVENT_DISPATCH_ERROR);
        $app->getEventManager()->triggerEvent($event);
    }
}
+3 −1
Changes for src/BjyAuthorize/Guard/Route.php: 3 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -66,6 +66,8 @@ class Route extends AbstractGuard
        /* @var $app \Zend\Mvc\Application */
        $app = $event->getTarget();

        $app->getEventManager()->trigger(MvcEvent::EVENT_DISPATCH_ERROR, $event);
//        $app->getEventManager()->trigger(MvcEvent::EVENT_DISPATCH_ERROR, $event);
        $event->setName(MvcEvent::EVENT_DISPATCH_ERROR);
        $app->getEventManager()->triggerEvent($event);
    }
}
+6 −6
Changes for src/BjyAuthorize/Service/Authorize.php: 6 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -8,18 +8,18 @@

namespace BjyAuthorize\Service;

use BjyAuthorize\Provider\Role\ProviderInterface as RoleProvider;
use BjyAuthorize\Acl\Role;
use BjyAuthorize\Guard\GuardInterface;
use BjyAuthorize\Provider\Identity\ProviderInterface as IdentityProvider;
use BjyAuthorize\Provider\Resource\ProviderInterface as ResourceProvider;
use BjyAuthorize\Provider\Role\ProviderInterface as RoleProvider;
use BjyAuthorize\Provider\Rule\ProviderInterface as RuleProvider;
use BjyAuthorize\Provider\Identity\ProviderInterface as IdentityProvider;
use Zend\ServiceManager\ServiceLocatorInterface;
use Zend\Cache\Storage\StorageInterface;
use Zend\Permissions\Acl\Acl;
use Zend\Permissions\Acl\Exception\InvalidArgumentException;
use Zend\Permissions\Acl\Resource\GenericResource;
use BjyAuthorize\Acl\Role;
use BjyAuthorize\Guard\GuardInterface;
use Zend\Permissions\Acl\Resource\ResourceInterface;
use Zend\Cache\Storage\StorageInterface;
use Zend\ServiceManager\ServiceLocatorInterface;

/**
 * Authorize service