1
0
mirror of synced 2025-02-02 13:31:45 +03:00

#6174 #5570 CS fixes around the EntityListenersOnMergeTest

This commit is contained in:
Marco Pivetta 2016-12-18 14:53:54 +01:00
parent 26fc8d60e6
commit beef8acdf5

View File

@ -2,22 +2,23 @@
namespace Doctrine\Tests\ORM\Functional; namespace Doctrine\Tests\ORM\Functional;
use Doctrine\ORM\Event\LifecycleEventArgs;
use Doctrine\Tests\Models\Company\CompanyContractListener; use Doctrine\Tests\Models\Company\CompanyContractListener;
use Doctrine\Tests\Models\Company\CompanyFixContract; use Doctrine\Tests\Models\Company\CompanyFixContract;
use Doctrine\Tests\Models\DDC3597\DDC3597Image; use Doctrine\Tests\Models\DDC3597\DDC3597Image;
use Doctrine\Tests\Models\DDC3597\DDC3597Media; use Doctrine\Tests\Models\DDC3597\DDC3597Media;
use Doctrine\Tests\Models\DDC3597\DDC3597Root; use Doctrine\Tests\Models\DDC3597\DDC3597Root;
use Doctrine\Tests\OrmFunctionalTestCase;
/** /**
* @group DDC-1955 * @group DDC-1955
* @group 5570 * @group 5570
* @group 6174 * @group 6174
*/ */
class EntityListenersOnMergeTest extends \Doctrine\Tests\OrmFunctionalTestCase class EntityListenersOnMergeTest extends OrmFunctionalTestCase
{ {
/** /**
* @var \Doctrine\Tests\Models\Company\CompanyContractListener * @var CompanyContractListener
*/ */
private $listener; private $listener;
@ -26,34 +27,32 @@ class EntityListenersOnMergeTest extends \Doctrine\Tests\OrmFunctionalTestCase
$this->useModelSet('company'); $this->useModelSet('company');
parent::setUp(); parent::setUp();
$this->_schemaTool->createSchema( $this->_schemaTool->createSchema([
[ $this->_em->getClassMetadata(DDC3597Root::class),
$this->_em->getClassMetadata(DDC3597Root::class), $this->_em->getClassMetadata(DDC3597Media::class),
$this->_em->getClassMetadata(DDC3597Media::class), $this->_em->getClassMetadata(DDC3597Image::class),
$this->_em->getClassMetadata(DDC3597Image::class), ]);
]
);
$this->listener = $this->_em->getConfiguration() $this->listener = $this->_em->getConfiguration()
->getEntityListenerResolver() ->getEntityListenerResolver()
->resolve('Doctrine\Tests\Models\Company\CompanyContractListener'); ->resolve(CompanyContractListener::class);
} }
protected function tearDown() protected function tearDown()
{ {
parent::tearDown(); parent::tearDown();
$this->_schemaTool->dropSchema(
[ $this->_schemaTool->dropSchema([
$this->_em->getClassMetadata(DDC3597Root::class), $this->_em->getClassMetadata(DDC3597Root::class),
$this->_em->getClassMetadata(DDC3597Media::class), $this->_em->getClassMetadata(DDC3597Media::class),
$this->_em->getClassMetadata(DDC3597Image::class), $this->_em->getClassMetadata(DDC3597Image::class),
] ]);
);
} }
public function testMergeNewEntityLifecyleEventsModificationsShouldBeKept() public function testMergeNewEntityLifecyleEventsModificationsShouldBeKept()
{ {
$imageEntity = new DDC3597Image('foobar'); $imageEntity = new DDC3597Image('foobar');
$imageEntity->setFormat('JPG'); $imageEntity->setFormat('JPG');
$imageEntity->setSize(123); $imageEntity->setSize(123);
$imageEntity->getDimension()->setWidth(300); $imageEntity->getDimension()->setWidth(300);
@ -68,6 +67,7 @@ class EntityListenersOnMergeTest extends \Doctrine\Tests\OrmFunctionalTestCase
public function testPrePersistListenersShouldBeFiredWithCorrectEntityData() public function testPrePersistListenersShouldBeFiredWithCorrectEntityData()
{ {
$fix = new CompanyFixContract(); $fix = new CompanyFixContract();
$fix->setFixPrice(2000); $fix->setFixPrice(2000);
$this->listener->prePersistCalls = []; $this->listener->prePersistCalls = [];
@ -79,15 +79,8 @@ class EntityListenersOnMergeTest extends \Doctrine\Tests\OrmFunctionalTestCase
$this->assertSame($fix, $this->listener->prePersistCalls[0][0]); $this->assertSame($fix, $this->listener->prePersistCalls[0][0]);
$this->assertInstanceOf( $this->assertInstanceOf(CompanyFixContract::class, $this->listener->prePersistCalls[0][0]);
'Doctrine\Tests\Models\Company\CompanyFixContract', $this->assertInstanceOf(LifecycleEventArgs::class, $this->listener->prePersistCalls[0][1]);
$this->listener->prePersistCalls[0][0]
);
$this->assertInstanceOf(
'Doctrine\ORM\Event\LifecycleEventArgs',
$this->listener->prePersistCalls[0][1]
);
$this->assertArrayHasKey('fixPrice', $this->listener->snapshots[CompanyContractListener::PRE_PERSIST][0]); $this->assertArrayHasKey('fixPrice', $this->listener->snapshots[CompanyContractListener::PRE_PERSIST][0]);
$this->assertEquals( $this->assertEquals(
@ -95,4 +88,4 @@ class EntityListenersOnMergeTest extends \Doctrine\Tests\OrmFunctionalTestCase
$this->listener->snapshots[CompanyContractListener::PRE_PERSIST][0]['fixPrice'] $this->listener->snapshots[CompanyContractListener::PRE_PERSIST][0]['fixPrice']
); );
} }
} }