Merge pull request #486 from CakeDC/develop

Develop

.travis.yml

@@ -39,9 +39,9 @@ before_script:
   - sh -c "if [ '$COVERALLS' = '1' ]; then mkdir -p build/logs; fi"
 
 script:
-  - sh -c "if [ '$DEFAULT' = '1' ]; then phpunit --stderr; fi"
+  - sh -c "if [ '$DEFAULT' = '1' ]; then ./vendor/bin/phpunit --stderr; fi"
   - sh -c "if [ '$PHPCS' = '1' ]; then ./vendor/bin/phpcs -p -n --extensions=php --standard=vendor/cakephp/cakephp-codesniffer/CakePHP ./src ./tests; fi"
-  - sh -c "if [ '$COVERALLS' = '1' ]; then phpunit --stderr --coverage-clover build/logs/clover.xml; fi"
+  - sh -c "if [ '$COVERALLS' = '1' ]; then ./vendor/bin/phpunit --stderr --coverage-clover build/logs/clover.xml; fi"
   - sh -c "if [ '$COVERALLS' = '1' ]; then php vendor/bin/coveralls -c .coveralls.yml -v; fi"
 
 notifications:

src/Controller/Component/UsersAuthComponent.php

@@ -15,6 +15,7 @@
 use Cake\Controller\Component;
 use Cake\Core\Configure;
 use Cake\Event\Event;
+use Cake\Event\EventManager;
 use Cake\Network\Request;
 use Cake\Routing\Exception\MissingRouteException;
 use Cake\Routing\Router;
@@ -98,7 +99,7 @@ protected function _loadRememberMe()
      */
     protected function _attachPermissionChecker()
     {
-        $this->_registry->getController()->eventManager()->on(self::EVENT_IS_AUTHORIZED, [], [$this, 'isUrlAuthorized']);
+        EventManager::instance()->on(self::EVENT_IS_AUTHORIZED, [], [$this, 'isUrlAuthorized']);
     }
 
     /**

src/View/Helper/AuthLinkHelper.php

@@ -3,6 +3,7 @@
 
 use CakeDC\Users\Controller\Component\UsersAuthComponent;
 use Cake\Event\Event;
+use Cake\Event\EventManager;
 use Cake\Utility\Hash;
 use Cake\View\Helper;
 use Cake\View\Helper\HtmlHelper;
@@ -48,7 +49,7 @@ public function link($title, $url = null, array $options = [])
     public function isAuthorized($url = null)
     {
         $event = new Event(UsersAuthComponent::EVENT_IS_AUTHORIZED, $this, ['url' => $url]);
-        $result = $this->_View->eventManager()->dispatch($event);
+        $result = EventManager::instance()->dispatch($event);
 
         return $result->result;
     }

tests/TestCase/View/Helper/AuthLinkHelperTest.php

@@ -4,6 +4,7 @@
 use CakeDC\Users\View\Helper\AuthLinkHelper;
 use CakeDC\Users\View\Helper\UserHelper;
 use Cake\Event\Event;
+use Cake\Event\EventManager;
 use Cake\TestSuite\TestCase;
 use Cake\View\View;
 
@@ -66,7 +67,7 @@ public function testLinkAuthorized()
         $eventManagerMock = $this->getMockBuilder('Cake\Event\EventManager')
             ->setMethods(['dispatch'])
             ->getMock();
-        $view->eventManager($eventManagerMock);
+        EventManager::instance($eventManagerMock);
         $this->AuthLink = new AuthLinkHelper($view);
         $result = new Event('dispatch-result');
         $result->result = true;
@@ -89,7 +90,7 @@ public function testLinkAuthorizedAllowedTrue()
         $eventManagerMock = $this->getMockBuilder('Cake\Event\EventManager')
             ->setMethods(['dispatch'])
             ->getMock();
-        $view->eventManager($eventManagerMock);
+        EventManager::instance($eventManagerMock);
         $this->AuthLink = new AuthLinkHelper($view);
         $result = new Event('dispatch-result');
         $result->result = true;
@@ -131,7 +132,7 @@ public function testIsAuthorized()
         $eventManagerMock = $this->getMockBuilder('Cake\Event\EventManager')
             ->setMethods(['dispatch'])
             ->getMock();
-        $view->eventManager($eventManagerMock);
+        EventManager::instance($eventManagerMock);
         $this->AuthLink = new AuthLinkHelper($view);
         $result = new Event('dispatch-result');
         $result->result = true;