doctrine#6174 doctrine#5570 CS fixes around the EntityListenersOnMergeTest

Ocramius · alexgurrola · commit 2c92851296a2 · 2017-04-13T15:46:57.000-07:00
diff --git a/tests/Doctrine/Tests/ORM/Functional/EntityListenersOnMergeTest.php b/tests/Doctrine/Tests/ORM/Functional/EntityListenersOnMergeTest.php
@@ -2,22 +2,23 @@
 
 namespace Doctrine\Tests\ORM\Functional;
 
+use Doctrine\ORM\Event\LifecycleEventArgs;
 use Doctrine\Tests\Models\Company\CompanyContractListener;
 use Doctrine\Tests\Models\Company\CompanyFixContract;
 use Doctrine\Tests\Models\DDC3597\DDC3597Image;
 use Doctrine\Tests\Models\DDC3597\DDC3597Media;
 use Doctrine\Tests\Models\DDC3597\DDC3597Root;
+use Doctrine\Tests\OrmFunctionalTestCase;
 
 /**
  * @group DDC-1955
  * @group 5570
  * @group 6174
  */
-class EntityListenersOnMergeTest extends \Doctrine\Tests\OrmFunctionalTestCase
+class EntityListenersOnMergeTest extends OrmFunctionalTestCase
 {
-
     /**
-     * @var \Doctrine\Tests\Models\Company\CompanyContractListener
+     * @var CompanyContractListener
      */
     private $listener;
 
@@ -26,34 +27,32 @@ protected function setUp()
         $this->useModelSet('company');
         parent::setUp();
 
-        $this->_schemaTool->createSchema(
-            [
-                $this->_em->getClassMetadata(DDC3597Root::class),
-                $this->_em->getClassMetadata(DDC3597Media::class),
-                $this->_em->getClassMetadata(DDC3597Image::class),
-            ]
-        );
+        $this->_schemaTool->createSchema([
+            $this->_em->getClassMetadata(DDC3597Root::class),
+            $this->_em->getClassMetadata(DDC3597Media::class),
+            $this->_em->getClassMetadata(DDC3597Image::class),
+        ]);
 
         $this->listener = $this->_em->getConfiguration()
             ->getEntityListenerResolver()
-            ->resolve('Doctrine\Tests\Models\Company\CompanyContractListener');
+            ->resolve(CompanyContractListener::class);
     }
 
     protected function tearDown()
     {
         parent::tearDown();
-        $this->_schemaTool->dropSchema(
-            [
-                $this->_em->getClassMetadata(DDC3597Root::class),
-                $this->_em->getClassMetadata(DDC3597Media::class),
-                $this->_em->getClassMetadata(DDC3597Image::class),
-            ]
-        );
+
+        $this->_schemaTool->dropSchema([
+            $this->_em->getClassMetadata(DDC3597Root::class),
+            $this->_em->getClassMetadata(DDC3597Media::class),
+            $this->_em->getClassMetadata(DDC3597Image::class),
+        ]);
     }
 
     public function testMergeNewEntityLifecyleEventsModificationsShouldBeKept()
     {
         $imageEntity = new DDC3597Image('foobar');
+
         $imageEntity->setFormat('JPG');
         $imageEntity->setSize(123);
         $imageEntity->getDimension()->setWidth(300);
@@ -68,6 +67,7 @@ public function testMergeNewEntityLifecyleEventsModificationsShouldBeKept()
     public function testPrePersistListenersShouldBeFiredWithCorrectEntityData()
     {
         $fix = new CompanyFixContract();
+
         $fix->setFixPrice(2000);
 
         $this->listener->prePersistCalls = [];
@@ -79,20 +79,13 @@ public function testPrePersistListenersShouldBeFiredWithCorrectEntityData()
 
         $this->assertSame($fix, $this->listener->prePersistCalls[0][0]);
 
-        $this->assertInstanceOf(
-            'Doctrine\Tests\Models\Company\CompanyFixContract',
-            $this->listener->prePersistCalls[0][0]
-        );
-
-        $this->assertInstanceOf(
-            'Doctrine\ORM\Event\LifecycleEventArgs',
-            $this->listener->prePersistCalls[0][1]
-        );
+        $this->assertInstanceOf(CompanyFixContract::class, $this->listener->prePersistCalls[0][0]);
+        $this->assertInstanceOf(LifecycleEventArgs::class, $this->listener->prePersistCalls[0][1]);
 
         $this->assertArrayHasKey('fixPrice', $this->listener->snapshots[CompanyContractListener::PRE_PERSIST][0]);
         $this->assertEquals(
             $fix->getFixPrice(),
             $this->listener->snapshots[CompanyContractListener::PRE_PERSIST][0]['fixPrice']
         );
     }
-}
+}
