RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-03 05:49:25 +03:00
Code Issues Projects Releases Wiki Activity

#6303 #6304 minor CS fixes in the test code - alignment/formatting

Browse Source
This commit is contained in:
Marco Pivetta 2017-08-19 16:37:24 +02:00
parent aaad25a061
commit f6ce69fe29
No known key found for this signature in database
GPG Key ID: 4167D3337FD9D629
1 changed files with 59 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
tests/Doctrine/Tests/ORM/Functional/Ticket/DDC6303Test.php
View File

@ -2,23 +2,25 @@
namespace Doctrine\Tests\ORM\Functional\Ticket; namespace Doctrine\Tests\ORM\Functional\Ticket;
use Doctrine\DBAL\Schema\SchemaException;
use Doctrine\Tests\OrmFunctionalTestCase;
/** /**
* @group DDC6303 * @group #6303
*/ */
class DDC6303Test extends \Doctrine\Tests\OrmFunctionalTestCase class DDC6303Test extends OrmFunctionalTestCase
{ {
public function setUp() public function setUp()
{ {
parent::setUp(); parent::setUp();
try { try {
$this->_schemaTool->createSchema( $this->_schemaTool->createSchema([
[
$this->_em->getClassMetadata(DDC6303Contract::class), $this->_em->getClassMetadata(DDC6303Contract::class),
$this->_em->getClassMetadata(DDC6303ContractA::class), $this->_em->getClassMetadata(DDC6303ContractA::class),
$this->_em->getClassMetadata(DDC6303ContractB::class) $this->_em->getClassMetadata(DDC6303ContractB::class),
] ]);
); } catch (SchemaException $ignored) {
} catch (\Exception $ignored) {} }
} }
public function testMixedTypeHydratedCorrectlyInJoinedInheritance() public function testMixedTypeHydratedCorrectlyInJoinedInheritance()
@ -45,16 +47,21 @@ class DDC6303Test extends \Doctrine\Tests\OrmFunctionalTestCase
$dataMap = [ $dataMap = [
$contractA->id => $contractAData, $contractA->id => $contractAData,
$contractB->id => $contractBData $contractB->id => $contractBData,
]; ];
$contracts = $repository->createQueryBuilder('p') $contracts = $repository
->createQueryBuilder('p')
->where('p.id IN(:ids)') ->where('p.id IN(:ids)')
->setParameter('ids', array_keys($dataMap)) ->setParameter('ids', array_keys($dataMap))
->getQuery()->getResult(); ->getQuery()->getResult();
foreach( $contracts as $contract ){ foreach ($contracts as $contract) {
static::assertEquals($contract->originalData, $dataMap[$contract->id], 'contract ' . get_class($contract) . ' not equals to original'); static::assertEquals(
$contract->originalData,
$dataMap[$contract->id],
'contract ' . get_class($contract) . ' not equals to original'
);
} }
} }
@ -65,12 +72,11 @@ class DDC6303Test extends \Doctrine\Tests\OrmFunctionalTestCase
$contractArrayEmptyData = []; $contractArrayEmptyData = [];
$contractStringEmpty = new DDC6303ContractA(); $contractStringEmpty = new DDC6303ContractA();
$contractStringEmpty->originalData = $contractStringEmptyData;
$contractStringZero = new DDC6303ContractA(); $contractStringZero = new DDC6303ContractA();
$contractStringZero->originalData = $contractStringZeroData;
$contractArrayEmpty = new DDC6303ContractB(); $contractArrayEmpty = new DDC6303ContractB();
$contractStringEmpty->originalData = $contractStringEmptyData;
$contractStringZero->originalData = $contractStringZeroData;
$contractArrayEmpty->originalData = $contractArrayEmptyData; $contractArrayEmpty->originalData = $contractArrayEmptyData;
$this->_em->persist($contractStringZero); $this->_em->persist($contractStringZero);
@ -90,21 +96,26 @@ class DDC6303Test extends \Doctrine\Tests\OrmFunctionalTestCase
$contractArrayEmpty->id => $contractArrayEmptyData, $contractArrayEmpty->id => $contractArrayEmptyData,
]; ];
$contracts = $repository->createQueryBuilder('p') $contracts = $repository
->createQueryBuilder('p')
->where('p.id IN(:ids)') ->where('p.id IN(:ids)')
->setParameter('ids', array_keys($dataMap)) ->setParameter('ids', array_keys($dataMap))
->getQuery()->getResult(); ->getQuery()
->getResult();
foreach( $contracts as $contract ){ foreach ($contracts as $contract) {
static::assertEquals($contract->originalData, $dataMap[$contract->id], 'contract ' . get_class($contract) . ' not equals to original'); static::assertEquals(
$contract->originalData,
$dataMap[$contract->id],
'contract ' . get_class($contract) . ' not equals to original'
);
} }
} }
} }
/** /**
* @Entity * @Entity
* @Table(name="ddc6303_contract") * @Table
* @InheritanceType("JOINED") * @InheritanceType("JOINED")
* @DiscriminatorColumn(name="discr", type="string") * @DiscriminatorColumn(name="discr", type="string")
* @DiscriminatorMap({ * @DiscriminatorMap({
@ -115,40 +126,20 @@ class DDC6303Test extends \Doctrine\Tests\OrmFunctionalTestCase
*/ */
class DDC6303Contract class DDC6303Contract
{ {
/** /** @Id @Column(type="integer") @GeneratedValue */
* @Id
* @Column(type="integer")
* @GeneratedValue
*/
public $id; public $id;
} }
/** @Entity @Table */
/**
* @Entity
* @Table(name="ddc6303_contracts_a")
*/
class DDC6303ContractA extends DDC6303Contract class DDC6303ContractA extends DDC6303Contract
{ {
/** /** @Column(type="string", nullable=true) */
* @Column(type="string", nullable=true)
*
* @var string
*/
public $originalData; public $originalData;
} }
/** @Entity @Table */
/**
* @Entity
* @Table(name="ddc6303_contracts_b")
*/
class DDC6303ContractB extends DDC6303Contract class DDC6303ContractB extends DDC6303Contract
{ {
/** /** @Column(type="simple_array", nullable=true) */
* @Column(type="simple_array", nullable=true)
*
* @var array
*/
public $originalData; public $originalData;
} }