diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-06-05 18:29:23 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-06-05 18:29:23 +0200 |
| commit | 42f6478db1887cd8fbdc2b46f4beda4469dfea17 (patch) | |
| tree | 7f077dbb24399d8884eee98b1d9f4fe18fa469e8 | |
| parent | 3cc16dfd5f68148e6a691809325c26bf0ed5b672 (diff) | |
| parent | ff113695fd1a67fc6e7a2c2b53472aed6380cf71 (diff) | |
| download | symfony-security-42f6478db1887cd8fbdc2b46f4beda4469dfea17.zip symfony-security-42f6478db1887cd8fbdc2b46f4beda4469dfea17.tar.gz symfony-security-42f6478db1887cd8fbdc2b46f4beda4469dfea17.tar.bz2 | |
Merge branch '2.6' into 2.7
* 2.6:
[Security] Update tests after a merge
[Console] Remove an unused argument and fix a small cs issue
| -rw-r--r-- | Acl/Tests/Domain/ObjectIdentityTest.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Acl/Tests/Domain/ObjectIdentityTest.php b/Acl/Tests/Domain/ObjectIdentityTest.php index 325bb91..70f89a3 100644 --- a/Acl/Tests/Domain/ObjectIdentityTest.php +++ b/Acl/Tests/Domain/ObjectIdentityTest.php @@ -71,7 +71,7 @@ namespace Symfony\Component\Security\Acl\Tests\Domain $id = ObjectIdentity::fromDomainObject($domainObject); $this->assertSame('1', $id->getIdentifier()); - $this->assertEquals('Symfony\Component\Security\Tests\Acl\Domain\TestDomainObject', $id->getType()); + $this->assertEquals('Symfony\Component\Security\Acl\Tests\Domain\TestDomainObject', $id->getType()); } public function testFromDomainObjectWithoutInterfaceAllowsZeroAsIdentifier() @@ -81,7 +81,7 @@ namespace Symfony\Component\Security\Acl\Tests\Domain $id = ObjectIdentity::fromDomainObject($domainObject); $this->assertSame('0', $id->getIdentifier()); - $this->assertEquals('Symfony\Component\Security\Tests\Acl\Domain\TestDomainObject', $id->getType()); + $this->assertEquals('Symfony\Component\Security\Acl\Tests\Domain\TestDomainObject', $id->getType()); } /** |