Merge branch 'cs/zendframework/zendframework#6872-php-cs-fixer-automa…

…ted-fixes' Close zendframework/zendframework#6872
zendframework · Nov 14, 2014 · f6f2e50 · f6f2e50
commit f6f2e50
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 17 deletions.
diff --git a/src/Acl.php b/src/Acl.php
@@ -633,15 +633,15 @@ public function setRule($operation, $type, $roles = null, $resources = null,
                             }
 
                             if (isset($rules['allPrivileges']['type']) &&
-                                $type === $rules['allPrivileges']['type'])
-                            {
+                                $type === $rules['allPrivileges']['type']
+                            ) {
                                 unset($rules['allPrivileges']);
                             }
                         } else {
                             foreach ($privileges as $privilege) {
                                 if (isset($rules['byPrivilegeId'][$privilege]) &&
-                                    $type === $rules['byPrivilegeId'][$privilege]['type'])
-                                {
+                                    $type === $rules['byPrivilegeId'][$privilege]['type']
+                                ) {
                                     unset($rules['byPrivilegeId'][$privilege]);
                                 }
                             }
@@ -756,7 +756,6 @@ public function isAllowed($role = null, $resource = null, $privilege = null)
 
                 // try next Resource
                 $resource = $this->resources[$resource->getResourceId()]['parent'];
-
             } while (true); // loop terminates at 'allResources' pseudo-parent
         } else {
             $this->isAllowedPrivilege = $privilege;
@@ -779,7 +778,6 @@ public function isAllowed($role = null, $resource = null, $privilege = null)
 
                 // try next Resource
                 $resource = $this->resources[$resource->getResourceId()]['parent'];
-
             } while (true); // loop terminates at 'allResources' pseudo-parent
         }
     }

diff --git a/src/Assertion/AssertionAggregate.php b/src/Assertion/AssertionAggregate.php
@@ -16,7 +16,6 @@
 
 class AssertionAggregate implements AssertionInterface
 {
-
     const MODE_ALL = 'all';
 
     const MODE_AT_LEAST_ONE = 'at_least_one';
@@ -134,7 +133,6 @@ public function assert(Acl $acl, RoleInterface $role = null, ResourceInterface $
         }
 
         foreach ($this->assertions as $assertion) {
-
             // jit assertion mloading
             if (! $assertion instanceof AssertionInterface) {
                 if (class_exists($assertion)) {

diff --git a/src/Assertion/AssertionManager.php b/src/Assertion/AssertionManager.php
@@ -13,7 +13,6 @@
 
 class AssertionManager extends AbstractPluginManager
 {
-
     protected $sharedByDefault = true;
 
     /**

diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php
@@ -10,4 +10,5 @@
 namespace Zend\Permissions\Acl\Exception;
 
 interface ExceptionInterface
-{}
+{
+}
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
@@ -11,4 +11,5 @@
 
 class InvalidArgumentException extends \InvalidArgumentException implements
     ExceptionInterface
-{}
+{
+}
diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
@@ -12,5 +12,4 @@
 class RuntimeException extends \RuntimeException implements
     ExceptionInterface
 {
-
 }
diff --git a/test/AclTest.php b/test/AclTest.php
@@ -1053,7 +1053,6 @@ public function testCMSExample()
         $this->assertTrue($this->_acl->isAllowed('marketing', 'latest', 'publish'));
         $this->assertTrue($this->_acl->isAllowed('marketing', 'latest', 'edit'));
         $this->assertTrue($this->_acl->isAllowed('marketing', 'latest'));
-
     }
 
     /**
@@ -1137,7 +1136,6 @@ public function testAclAssertionsGetProperRoleWhenInheritenceIsUsed()
         $this->assertTrue($acl->isAllowed($user, $blogPost, 'modify'));
 
         $this->assertEquals('publisher', $assertion->lastAssertRole->getRoleId());
-
     }
 
     /**
@@ -1167,7 +1165,6 @@ public function testAclAssertionsGetOriginalIsAllowedObjects()
         // check to see if the last assertion has the proper objects
         $this->assertInstanceOf('ZendTest\Permissions\Acl\TestAsset\UseCase1\User', $assertion->lastAssertRole, 'Assertion did not receive proper role object');
         $this->assertInstanceOf('ZendTest\Permissions\Acl\TestAsset\UseCase1\BlogPost', $assertion->lastAssertResource, 'Assertion did not receive proper resource object');
-
     }
 
     /**

diff --git a/test/Assertion/AssertionAggregateTest.php b/test/Assertion/AssertionAggregateTest.php
@@ -13,7 +13,6 @@
 
 class AssertionAggregateTest extends \PHPUnit_Framework_TestCase
 {
-
     protected $assertionAggregate;
 
     public function setUp()

diff --git a/test/Assertion/AssertionManagerTest.php b/test/Assertion/AssertionManagerTest.php
@@ -12,7 +12,6 @@
 
 class AssertionManagerTest extends \PHPUnit_Framework_TestCase
 {
-
     protected $manager;
 
     public function setUp()
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,6 @@ @@
     class AssertionManager extends AbstractPluginManager
     {
         protected $sharedByDefault = true;
         /**
@@ Expand Down @@