Merge pull request #8798 from greg0ire/backport-7776

 Remove hack to access class scope inside closures

Author: greg0ire

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3123Test.php

@@ -23,7 +23,6 @@ protected function setUp(): void
 
     public function testIssue(): void
     {
-        $test = $this;
         $user = new CmsUser();
         $uow  = $this->_em->getUnitOfWork();
 
@@ -40,12 +39,12 @@ public function testIssue(): void
         $listener
             ->expects($this->once())
             ->method(Events::postFlush)
-            ->will($this->returnCallback(static function () use ($uow, $test): void {
+            ->will($this->returnCallback(function () use ($uow): void {
                 $reflection = new ReflectionObject($uow);
                 $property   = $reflection->getProperty('extraUpdates');
 
                 $property->setAccessible(true);
-                $test->assertEmpty(
+                $this->assertEmpty(
                     $property->getValue($uow),
                     'ExtraUpdates are reset before postFlush'
                 );

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3644Test.php

@@ -164,23 +164,19 @@ class DDC3644User
 
     public function setAddresses(Collection $addresses): void
     {
-        $self = $this;
-
         $this->addresses = $addresses;
 
-        $addresses->map(static function ($address) use ($self): void {
-            $address->user = $self;
+        $addresses->map(function ($address): void {
+            $address->user = $this;
         });
     }
 
     public function setPets(Collection $pets): void
     {
-        $self = $this;
-
         $this->pets = $pets;
 
-        $pets->map(static function ($pet) use ($self): void {
-            $pet->owner = $self;
+        $pets->map(function ($pet): void {
+            $pet->owner = $this;
         });
     }
 }

tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php

@@ -392,10 +392,10 @@ public function testFallbackLoadingCausesEventTriggeringThatCanModifyFetchedMeta
         $listener
             ->expects($this->any())
             ->method('onClassMetadataNotFound')
-            ->will($this->returnCallback(static function (OnClassMetadataNotFoundEventArgs $args) use ($metadata, $em, $test): void {
-                $test->assertNull($args->getFoundMetadata());
-                $test->assertSame('Foo', $args->getClassName());
-                $test->assertSame($em, $args->getObjectManager());
+            ->will($this->returnCallback(static function (OnClassMetadataNotFoundEventArgs $args) use ($metadata, $em): void {
+                self::assertNull($args->getFoundMetadata());
+                self::assertSame('Foo', $args->getClassName());
+                self::assertSame($em, $args->getObjectManager());
 
                 $args->setFoundMetadata($metadata);
             }));