CS fixes and usage of phpcs to ensure PSR2 compatibility

.travis.yml

@@ -13,7 +13,7 @@ before_script:
 
 script:
   - ./vendor/bin/phpunit --coverage-clover ./build/logs/clover.xml
-  - output=$(php php-cs-fixer.phar fix -v --dry-run --level=psr2 ./src/); if [[ $output ]]; then while read -r line; do echo -e "\e[00;31m$line\e[00m"; done <<< "$output"; false; fi;
+  - ./vendor/bin/phpcs --standard=PSR2 ./src/ ./tests/
 
 after_script:
   - php vendor/bin/coveralls -v

composer.json

@@ -39,6 +39,7 @@
         "doctrine/common":                    ">=2.3,<2.5-dev",
         "zendframework/zend-developer-tools": "0.*",
         "zf-commons/zfc-user":                "0.*",
+        "squizlabs/php_codesniffer":          "1.4.*",
         "satooshi/php-coveralls":             "~0.6"
     },
     "suggests": {

src/BjyAuthorize/View/RedirectionStrategy.php

@@ -74,8 +74,7 @@ public function onDispatchError(MvcEvent $event)
         $error      = $event->getError();
         $url        = $this->redirectUri;
 
-        if (
-            $result instanceof Response
+        if ($result instanceof Response
             || ! $routeMatch
             || ($response && ! $response instanceof Response)
             || ! (

tests/BjyAuthorizeTest/Collector/RoleCollectorTest.php

@@ -105,11 +105,13 @@ public function testTraversableCollect()
             ->method('getIdentityRoles')
             ->will(
                 $this->returnValue(
-                    new \ArrayIterator(array(
-                        $role1,
-                        'role2',
-                        'key' => 'role3',
-                    ))
+                    new \ArrayIterator(
+                        array(
+                            $role1,
+                            'role2',
+                            'key' => 'role3',
+                        )
+                    )
                 )
             );
 

tests/BjyAuthorizeTest/Guard/ControllerTest.php

@@ -51,13 +51,8 @@ public function setUp()
             ->serviceLocator
             ->expects($this->any())
             ->method('get')
-            ->will($this->returnCallback(function ($name) use ($authorize) {
-                if ($name === 'BjyAuthorize\Service\Authorize') {
-                    return $authorize;
-                }
-
-                throw new \UnexpectedValueException();
-            }));
+            ->with('BjyAuthorize\\Service\\Authorize')
+            ->will($this->returnValue($authorize));
     }
 
     /**
@@ -129,9 +124,13 @@ public function testOnDispatchWithValidController()
             ->authorize
             ->expects($this->any())
             ->method('isAllowed')
-            ->will($this->returnValue(function ($resource) {
-                return $resource === 'controller/test-controller';
-            }));
+            ->will(
+                $this->returnValue(
+                    function ($resource) {
+                        return $resource === 'controller/test-controller';
+                    }
+                )
+            );
 
         $this->assertNull($this->controllerGuard->onDispatch($event), 'Does not stop event propagation');
     }
@@ -147,9 +146,13 @@ public function testOnDispatchWithValidControllerAndAction()
             ->authorize
             ->expects($this->any())
             ->method('isAllowed')
-            ->will($this->returnValue(function ($resource) {
-                return $resource === 'controller/test-controller:test-action';
-            }));
+            ->will(
+                $this->returnValue(
+                    function ($resource) {
+                        return $resource === 'controller/test-controller:test-action';
+                    }
+                )
+            );
 
         $this->assertNull($this->controllerGuard->onDispatch($event), 'Does not stop event propagation');
     }
@@ -165,9 +168,13 @@ public function testOnDispatchWithValidControllerAndMethod()
             ->authorize
             ->expects($this->any())
             ->method('isAllowed')
-            ->will($this->returnValue(function ($resource) {
-                return $resource === 'controller/test-controller:put';
-            }));
+            ->will(
+                $this->returnValue(
+                    function ($resource) {
+                        return $resource === 'controller/test-controller:put';
+                    }
+                )
+            );
 
         $this->assertNull($this->controllerGuard->onDispatch($event), 'Does not stop event propagation');
     }
@@ -203,12 +210,8 @@ public function testOnDispatchWithInvalidResource()
             ->will($this->returnValue(false));
         $event->expects($this->once())->method('setError')->with(Controller::ERROR);
         $event->expects($this->exactly(3))->method('setParam')->with(
-            $this->callback(function ($key) {
-                return in_array($key, array('identity', 'controller', 'action'));
-            }),
-            $this->callback(function ($val) {
-                return in_array($val, array('admin', 'test-controller', 'test-action'));
-            })
+            $this->logicalOr('identity', 'controller', 'action'),
+            $this->logicalOr('admin', 'test-controller', 'test-action')
         );
         $event
             ->getTarget()
@@ -243,17 +246,21 @@ private function createMvcEvent($controller = null, $action = null, $method = nu
         $routeMatch
             ->expects($this->any())
             ->method('getParam')
-            ->will($this->returnCallback(function ($param) use ($controller, $action) {
-                if ($param === 'controller') {
-                    return $controller;
-                }
-
-                if ($param === 'action') {
-                    return $action;
-                }
-
-                return null;
-            }));
+            ->will(
+                $this->returnCallback(
+                    function ($param) use ($controller, $action) {
+                        if ($param === 'controller') {
+                            return $controller;
+                        }
+
+                        if ($param === 'action') {
+                            return $action;
+                        }
+
+                        return null;
+                    }
+                )
+            );
 
         return $event;
     }

tests/BjyAuthorizeTest/Guard/RouteTest.php

@@ -51,13 +51,8 @@ public function setUp()
             ->serviceLocator
             ->expects($this->any())
             ->method('get')
-            ->will($this->returnCallback(function ($name) use ($authorize) {
-                if ($name === 'BjyAuthorize\Service\Authorize') {
-                    return $authorize;
-                }
-
-                throw new \UnexpectedValueException();
-            }));
+            ->with('BjyAuthorize\\Service\\Authorize')
+            ->will($this->returnValue($authorize));
     }
 
     /**
@@ -148,9 +143,13 @@ public function testOnRouteWithValidRoute()
             ->authorize
             ->expects($this->any())
             ->method('isAllowed')
-            ->will($this->returnValue(function ($resource) {
-                return $resource === 'route/test-route';
-            }));
+            ->will(
+                $this->returnValue(
+                    function ($resource) {
+                        return $resource === 'route/test-route';
+                    }
+                )
+            );
 
         $this->assertNull($this->routeGuard->onRoute($event), 'Does not stop event propagation');
     }
@@ -169,12 +168,8 @@ public function testOnRouteWithInvalidResource()
             ->will($this->returnValue(false));
         $event->expects($this->once())->method('setError')->with(Route::ERROR);
         $event->expects($this->exactly(2))->method('setParam')->with(
-            $this->callback(function ($key) {
-                return in_array($key, array('identity', 'route'));
-            }),
-            $this->callback(function ($val) {
-                return in_array($val, array('admin', 'test-route'));
-            })
+            $this->logicalOr('identity', 'route'),
+            $this->logicalOr('admin', 'test-route')
         );
         $event
             ->getTarget()

tests/BjyAuthorizeTest/Provider/Resource/ConfigTest.php

@@ -24,10 +24,7 @@ class ConfigTest extends PHPUnit_Framework_TestCase
      */
     public function testGetResources()
     {
-        $config = new Config(array(
-            'resource1',
-            'resource2',
-        ));
+        $config = new Config(array('resource1', 'resource2',));
 
         $resources = $config->getResources();
 

tests/BjyAuthorizeTest/Provider/Role/ConfigTest.php

@@ -25,19 +25,21 @@ class ConfigTest extends PHPUnit_Framework_TestCase
      */
     public function testConstructor()
     {
-        $config = new Config(array(
-            'role1' => array(),
-            'role2',
-            'role3' => array(
-                'children' => array('role4'),
-            ),
-            'role5' => array(
-                'children' => array(
-                    'role6',
-                    'role7' => array(),
+        $config = new Config(
+            array(
+                'role1' => array(),
+                'role2',
+                'role3' => array(
+                    'children' => array('role4'),
                 ),
-            ),
-        ));
+                'role5' => array(
+                    'children' => array(
+                        'role6',
+                        'role7' => array(),
+                    ),
+                ),
+            )
+        );
 
         $roles = $config->getRoles();
 
@@ -46,10 +48,10 @@ public function testConstructor()
         /* @var $role \BjyAuthorize\Acl\Role */
         foreach ($roles as $role) {
             $this->assertInstanceOf('BjyAuthorize\Acl\Role', $role);
-            $this->assertTrue(in_array(
+            $this->assertContains(
                 $role->getRoleId(),
                 array('role1', 'role2', 'role3', 'role4', 'role5', 'role6', 'role7')
-            ));
+            );
 
             if ('role4' === $role->getRoleId()) {
                 $this->assertNotNull($role->getParent());

tests/BjyAuthorizeTest/Provider/Role/ObjectRepositoryProviderTest.php

@@ -81,7 +81,7 @@ public function testGetRolesWithNoParents()
             new Role('role2', null),
         );
 
-       $this->assertEquals($expects, $this->provider->getRoles());
+        $this->assertEquals($expects, $this->provider->getRoles());
     }
 
     /**
@@ -109,6 +109,6 @@ public function testGetRolesWithParents()
             new Role('role3', $expectedRole1),
         );
 
-       $this->assertEquals($expects, $this->provider->getRoles());
+        $this->assertEquals($expects, $this->provider->getRoles());
     }
 }

tests/BjyAuthorizeTest/Service/AuthenticationIdentityProviderServiceFactoryTest.php

@@ -40,23 +40,23 @@ public function testCreateService()
         $serviceLocator
             ->expects($this->any())
             ->method('get')
-            ->will($this->returnCallback(function ($service) use ($user, $config) {
-                if ('zfcuser_user_service' === $service) {
-                    return $user;
-                }
-
-                if ('BjyAuthorize\Config' === $service) {
-                    return $config;
-                }
-
-                throw new \InvalidArgumentException();
-            }));
+            ->with($this->logicalOr('zfcuser_user_service', 'BjyAuthorize\\Config'))
+            ->will(
+                $this->returnCallback(
+                    function ($service) use ($user, $config) {
+                        if ('zfcuser_user_service' === $service) {
+                            return $user;
+                        }
+
+                        return $config;
+                    }
+                )
+            );
 
         $authenticationFactory = new AuthenticationIdentityProviderServiceFactory();
         $authentication        = $authenticationFactory->createService($serviceLocator);
 
         $this->assertEquals($authentication->getDefaultRole(), 'test-guest');
         $this->assertEquals($authentication->getAuthenticatedRole(), 'test-user');
     }
-
 }

tests/BjyAuthorizeTest/Service/AuthorizeTest.php

@@ -30,12 +30,18 @@ public function testLoadLoadsAclFromCacheAndDoesNotBuildANewAclObject()
                       ->disableOriginalConstructor()
                       ->getMock();
 
-        $cache->expects($this->once())
-              ->method('getItem')
-              ->will($this->returnCallback(function($key, &$success) use ($acl) {
-                  $success = true;
-                  return $acl;
-              }));
+        $cache
+            ->expects($this->once())
+            ->method('getItem')
+            ->will(
+                $this->returnCallback(
+                    function ($key, & $success) use ($acl) {
+                        $success = true;
+
+                        return $acl;
+                    }
+                )
+            );
 
         $serviceManager = new ServiceManager();
         $serviceManager->setService(

tests/BjyAuthorizeTest/Service/BaseProvidersServiceFactoryTest.php

@@ -11,7 +11,6 @@
 namespace BjyAuthorizeTest\Service;
 
 use PHPUnit_Framework_TestCase;
-use BjyAuthorize\Service\BaseProvidersServiceFactory;
 
 /**
  * Test for {@see \BjyAuthorize\Service\ResourceProvidersServiceFactory}
@@ -40,24 +39,33 @@ public function testCreateService()
         $serviceLocator
             ->expects($this->any())
             ->method('has')
-            ->will($this->returnCallback(function ($serviceName) {
-                return in_array($serviceName, array('foo', 'bar'), true);
-            }));
+            ->will(
+                $this->returnCallback(
+                    function ($serviceName) {
+                        return in_array($serviceName, array('foo', 'bar'), true);
+                    }
+                )
+            );
 
         $serviceLocator
             ->expects($this->any())
             ->method('get')
-            ->will($this->returnCallback(function ($serviceName) use ($foo, $bar, $config) {
-                if ('BjyAuthorize\\Config' === $serviceName) {
-                    return $config;
-                }
+            ->with($this->logicalOr('BjyAuthorize\\Config', 'foo', 'bar'))
+            ->will(
+                $this->returnCallback(
+                    function ($serviceName) use ($foo, $bar, $config) {
+                        if ('BjyAuthorize\\Config' === $serviceName) {
+                            return $config;
+                        }
 
-                if ('foo' === $serviceName) {
-                    return $foo;
-                }
+                        if ('foo' === $serviceName) {
+                            return $foo;
+                        }
 
-                return $bar;
-            }));
+                        return $bar;
+                    }
+                )
+            );
 
         $providers = $factory->createService($serviceLocator);