Upgrade 1-11.38

vendor/symfony/security-acl/Tests/Domain/ObjectIdentityTest.php

@@ -12,8 +12,9 @@
 namespace Symfony\Component\Security\Acl\Tests\Domain
 {
     use Symfony\Component\Security\Acl\Domain\ObjectIdentity;
+    use Symfony\Component\Security\Acl\Model\DomainObjectInterface;
 
-    class ObjectIdentityTest extends \PHPUnit_Framework_TestCase
+    class ObjectIdentityTest extends \PHPUnit\Framework\TestCase
     {
         public function testConstructor()
         {
@@ -34,17 +35,17 @@ namespace Symfony\Component\Security\Acl\Tests\Domain
 
         public function testFromDomainObjectPrefersInterfaceOverGetId()
         {
-            $domainObject = $this->getMock('Symfony\Component\Security\Acl\Model\DomainObjectInterface');
-            $domainObject
-                ->expects($this->once())
-                ->method('getObjectIdentifier')
-                ->will($this->returnValue('getObjectIdentifier()'))
-            ;
-            $domainObject
-                ->expects($this->never())
-                ->method('getId')
-                ->will($this->returnValue('getId()'))
-            ;
+            $domainObject = new class() implements DomainObjectInterface {
+                public function getObjectIdentifier()
+                {
+                    return 'getObjectIdentifier()';
+                }
+
+                public function getId()
+                {
+                    return 'getId()';
+                }
+            };
 
             $id = ObjectIdentity::fromDomainObject($domainObject);
             $this->assertEquals('getObjectIdentifier()', $id->getIdentifier());
@@ -98,12 +99,12 @@ namespace Symfony\Component\Security\Acl\Tests\Domain
 
         public function getCompareData()
         {
-            return array(
-                array(new ObjectIdentity('123', 'foo'), new ObjectIdentity('123', 'foo'), true),
-                array(new ObjectIdentity('123', 'foo'), new ObjectIdentity(123, 'foo'), true),
-                array(new ObjectIdentity('1', 'foo'), new ObjectIdentity('2', 'foo'), false),
-                array(new ObjectIdentity('1', 'bla'), new ObjectIdentity('1', 'blub'), false),
-            );
+            return [
+                [new ObjectIdentity('123', 'foo'), new ObjectIdentity('123', 'foo'), true],
+                [new ObjectIdentity('123', 'foo'), new ObjectIdentity(123, 'foo'), true],
+                [new ObjectIdentity('1', 'foo'), new ObjectIdentity('2', 'foo'), false],
+                [new ObjectIdentity('1', 'bla'), new ObjectIdentity('1', 'blub'), false],
+            ];
         }
     }