Merge branch '2.7' into 2.8

* 2.7:
  [Security] Update tests after a merge
  [Console] Remove an unused argument and fix a small cs issue
  [Translator] avoid serialize unserializable resources.

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());
         }
 
         /**