Remove hack to access class scope inside closures

This is possible since 5.4.
doctrine · Jul 21, 2019 · 79b038a · 79b038a
1 parent d606941
commit 79b038a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 17 deletions.
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3123Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3123Test.php
@@ -22,7 +22,6 @@ protected function setUp() : void
 
     public function testIssue() : void
     {
-        $test = $this;
         $user = new CmsUser();
         $uow  = $this->em->getUnitOfWork();
 
@@ -39,8 +38,8 @@ public function testIssue() : void
         $listener
             ->expects($this->once())
             ->method(Events::postFlush)
-            ->will($this->returnCallback(static function () use ($uow, $test) {
-                $test->assertAttributeEmpty('extraUpdates', $uow, 'ExtraUpdates are reset before postFlush');
+            ->will($this->returnCallback(function () use ($uow) {
+                self::assertAttributeEmpty('extraUpdates', $uow, 'ExtraUpdates are reset before postFlush');
             }));
 
         $this->em->getEventManager()->addEventListener(Events::postFlush, $listener);

diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3644Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3644Test.php
@@ -154,23 +154,19 @@ class DDC3644User
 
     public function setAddresses(Collection $addresses)
     {
-        $self = $this;
-
         $this->addresses = $addresses;
 
-        $addresses->map(static function ($address) use ($self) {
-            $address->user = $self;
+        $addresses->map(function ($address) {
+            $address->user = $this;
         });
     }
 
     public function setPets(Collection $pets)
     {
-        $self = $this;
-
         $this->pets = $pets;
 
-        $pets->map(static function ($pet) use ($self) {
-            $pet->owner = $self;
+        $pets->map(function ($pet) {
+            $pet->owner = $this;
         });
     }
 }

diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php
@@ -336,8 +336,6 @@ public function testQuoteMetadata() : void
      */
     public function testFallbackLoadingCausesEventTriggeringThatCanModifyFetchedMetadata() : void
     {
-        $test = $this;
-
         /** @var ClassMetadata $metadata */
         $metadata     = $this->createMock(ClassMetadata::class);
         $cmf          = new ClassMetadataFactory();
@@ -351,10 +349,10 @@ public function testFallbackLoadingCausesEventTriggeringThatCanModifyFetchedMeta
         $listener
             ->expects($this->any())
             ->method('onClassMetadataNotFound')
-            ->will($this->returnCallback(static function (OnClassMetadataNotFoundEventArgs $args) use ($metadata, $em, $test) {
-                $test->assertNull($args->getFoundMetadata());
-                $test->assertSame('Foo', $args->getClassName());
-                $test->assertSame($em, $args->getObjectManager());
+            ->will($this->returnCallback(function (OnClassMetadataNotFoundEventArgs $args) use ($metadata, $em) {
+                self::assertNull($args->getFoundMetadata());
+                self::assertSame('Foo', $args->getClassName());
+                self::assertSame($em, $args->getObjectManager());
 
                 $args->setFoundMetadata($metadata);
             }));