Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'zf2/develop' into zend-validator-bitwise
Browse files Browse the repository at this point in the history
  • Loading branch information
Corentin Larose committed Oct 22, 2013
100 parents a6922a1 + 61e86cc + 2755e28 + 666e28e + 7c5abb8 + d753388 + e33d218 + b0d3cc2 + 05539b9 + 56091aa + c47d6e1 + dcee015 + 6c132b6 + 7065efb + e63c913 + b34a30f + f6898d8 + 9d8ce42 + e8926e5 + 5f59463 + 30b6149 + 843dd21 + 6d04042 + 98ed105 + ea632d6 + c2c0c90 + 4d8678c + b5fe867 + dd6dd90 + fe69d86 + 7e4c1bb + c718944 + 032f2c6 + e587c4a + afb2df9 + 4ea8d76 + 9dfff7d + c88317e + 2be5985 + 9490459 + 8e68e61 + b111673 + 18367f4 + f312673 + d7f78c7 + 82f434d + 9355d07 + 9cc8996 + 202d5af + 4dff9cb + 8834dfc + 81b48da + 480b4d7 + df42df9 + 3ee9c5e + b7556e5 + 4c81c23 + 9c8309f + 35ab5f0 + 85e1f91 + 3cb23c1 + 16f6088 + d32c68c + df5b9c3 + 1936d7e + c478319 + 9fafd09 + e102ab1 + a90bdee + 2f9fa9f + aad5075 + 4127f0d + eda7358 + 25538ec + ff2c116 + ee7f5d8 + 60fd2f8 + 33976d4 + 446a94e + fbb88bb + 78a9131 + d4d4e35 + 444b3aa + 51abe83 + af16339 + d531e0a + 46c7d78 + 25d96a9 + 71d7e50 + 03600cd + f2f56b8 + d78b598 + 40b06f5 + 0512c9a + 598e6a5 + 6e40a22 + 90bd82f + e7b8a17 + c93e356 + 512b56d commit fb112da
Show file tree
Hide file tree
Showing 9 changed files with 4 additions and 15 deletions.
2 changes: 1 addition & 1 deletion src/Acl.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ class Acl implements AclInterface
* will have the least priority, and the last parent added will have the
* highest priority.
*
* @param Role\RoleInterface $role
* @param Role\RoleInterface|string $role
* @param Role\RoleInterface|string|array $parents
* @throws Exception\InvalidArgumentException
* @return Acl Provides a fluent interface
Expand Down
10 changes: 3 additions & 7 deletions test/AclTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Permissions
*/

namespace ZendTest\Permissions\Acl;
Expand All @@ -15,9 +14,6 @@
use Zend\Permissions\Acl\Resource;

/**
* @category Zend
* @package Zend_Permissions
* @subpackage UnitTests
* @group Zend_Acl
*/
class AclTest extends \PHPUnit_Framework_TestCase
Expand Down Expand Up @@ -1168,7 +1164,7 @@ public function testAclAssertionsGetOriginalIsAllowedObjects()
$assertion->assertReturnValue = false;
$this->assertFalse($acl->isAllowed($user, $blogPost, 'modify'), 'Assertion should return false');

// check to see if the last assertion has the proper objets
// 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');

Expand Down Expand Up @@ -1224,13 +1220,13 @@ public function testMethodRemoveAllowDoesNotThrowNotice()
public function testRoleObjectImplementsToString()
{
$role = new Role\GenericRole('_fooBar_');
$this->assertEquals('_fooBar_',(string)$role);
$this->assertEquals('_fooBar_',(string) $role);
}

public function testResourceObjectImplementsToString()
{
$resource = new Resource\GenericResource('_fooBar_');
$this->assertEquals('_fooBar_',(string)$resource);
$this->assertEquals('_fooBar_',(string) $resource);
}

/**
Expand Down
1 change: 0 additions & 1 deletion test/TestAsset/AssertionZF7973.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Permissions
*/

namespace ZendTest\Permissions\Acl\TestAsset;
Expand Down
1 change: 0 additions & 1 deletion test/TestAsset/ExtendedAclZF2234.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Permissions
*/

namespace ZendTest\Permissions\Acl\TestAsset;
Expand Down
1 change: 0 additions & 1 deletion test/TestAsset/MockAssertion.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Permissions
*/

namespace ZendTest\Permissions\Acl\TestAsset;
Expand Down
1 change: 0 additions & 1 deletion test/TestAsset/UseCase1/Acl.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Permissions
*/

namespace ZendTest\Permissions\Acl\TestAsset\UseCase1;
Expand Down
1 change: 0 additions & 1 deletion test/TestAsset/UseCase1/BlogPost.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Permissions
*/

namespace ZendTest\Permissions\Acl\TestAsset\UseCase1;
Expand Down
1 change: 0 additions & 1 deletion test/TestAsset/UseCase1/User.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Permissions
*/

namespace ZendTest\Permissions\Acl\TestAsset\UseCase1;
Expand Down
1 change: 0 additions & 1 deletion test/TestAsset/UseCase1/UserIsBlogPostOwnerAssertion.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Permissions
*/

namespace ZendTest\Permissions\Acl\TestAsset\UseCase1;
Expand Down

0 comments on commit fb112da

Please sign in to comment.