Merge branch '2.6' into 2.7

fabpot · fabpot · commit 42f6478db188 · 2015-06-05T18:29:23.000+02:00
* 2.6:
  [Security] Update tests after a merge
  [Console] Remove an unused argument and fix a small cs issue
diff --git a/Acl/Tests/Domain/ObjectIdentityTest.php b/Acl/Tests/Domain/ObjectIdentityTest.php
@@ -71,7 +71,7 @@ public function testFromDomainObjectWithoutInterfaceEnforcesStringIdentifier()
             $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 @@ public function testFromDomainObjectWithoutInterfaceAllowsZeroAsIdentifier()
             $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());
         }
 
         /**

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public function testFromDomainObjectWithoutInterfaceEnforcesStringIdentifier()`
`71`	`71`	`$id = ObjectIdentity::fromDomainObject($domainObject);`
`72`	`72`
`73`	`73`	`$this->assertSame('1', $id->getIdentifier());`
`74`		`- $this->assertEquals('Symfony\Component\Security\Tests\Acl\Domain\TestDomainObject', $id->getType());`
	`74`	`+ $this->assertEquals('Symfony\Component\Security\Acl\Tests\Domain\TestDomainObject', $id->getType());`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`public function testFromDomainObjectWithoutInterfaceAllowsZeroAsIdentifier()`
`@@ -81,7 +81,7 @@ public function testFromDomainObjectWithoutInterfaceAllowsZeroAsIdentifier()`
`81`	`81`	`$id = ObjectIdentity::fromDomainObject($domainObject);`
`82`	`82`
`83`	`83`	`$this->assertSame('0', $id->getIdentifier());`
`84`		`- $this->assertEquals('Symfony\Component\Security\Tests\Acl\Domain\TestDomainObject', $id->getType());`
	`84`	`+ $this->assertEquals('Symfony\Component\Security\Acl\Tests\Domain\TestDomainObject', $id->getType());`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`/**`