1
0
mirror of synced 2025-02-09 08:49:26 +03:00

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

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

View File

@ -2,23 +2,25 @@
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()
{
parent::setUp();
try {
$this->_schemaTool->createSchema(
[
$this->_schemaTool->createSchema([
$this->_em->getClassMetadata(DDC6303Contract::class),
$this->_em->getClassMetadata(DDC6303ContractA::class),
$this->_em->getClassMetadata(DDC6303ContractB::class)
]
);
} catch (\Exception $ignored) {}
$this->_em->getClassMetadata(DDC6303ContractB::class),
]);
} catch (SchemaException $ignored) {
}
}
public function testMixedTypeHydratedCorrectlyInJoinedInheritance()
@ -45,16 +47,21 @@ class DDC6303Test extends \Doctrine\Tests\OrmFunctionalTestCase
$dataMap = [
$contractA->id => $contractAData,
$contractB->id => $contractBData
$contractB->id => $contractBData,
];
$contracts = $repository->createQueryBuilder('p')
$contracts = $repository
->createQueryBuilder('p')
->where('p.id IN(:ids)')
->setParameter('ids', array_keys($dataMap))
->getQuery()->getResult();
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 = [];
$contractStringEmpty = new DDC6303ContractA();
$contractStringEmpty->originalData = $contractStringEmptyData;
$contractStringZero = new DDC6303ContractA();
$contractStringZero->originalData = $contractStringZeroData;
$contractArrayEmpty = new DDC6303ContractB();
$contractStringEmpty->originalData = $contractStringEmptyData;
$contractStringZero->originalData = $contractStringZeroData;
$contractArrayEmpty->originalData = $contractArrayEmptyData;
$this->_em->persist($contractStringZero);
@ -90,21 +96,26 @@ class DDC6303Test extends \Doctrine\Tests\OrmFunctionalTestCase
$contractArrayEmpty->id => $contractArrayEmptyData,
];
$contracts = $repository->createQueryBuilder('p')
$contracts = $repository
->createQueryBuilder('p')
->where('p.id IN(:ids)')
->setParameter('ids', array_keys($dataMap))
->getQuery()->getResult();
->getQuery()
->getResult();
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
* @Table(name="ddc6303_contract")
* @Table
* @InheritanceType("JOINED")
* @DiscriminatorColumn(name="discr", type="string")
* @DiscriminatorMap({
@ -115,40 +126,20 @@ class DDC6303Test extends \Doctrine\Tests\OrmFunctionalTestCase
*/
class DDC6303Contract
{
/**
* @Id
* @Column(type="integer")
* @GeneratedValue
*/
/** @Id @Column(type="integer") @GeneratedValue */
public $id;
}
/**
* @Entity
* @Table(name="ddc6303_contracts_a")
*/
/** @Entity @Table */
class DDC6303ContractA extends DDC6303Contract
{
/**
* @Column(type="string", nullable=true)
*
* @var string
*/
/** @Column(type="string", nullable=true) */
public $originalData;
}
/**
* @Entity
* @Table(name="ddc6303_contracts_b")
*/
/** @Entity @Table */
class DDC6303ContractB extends DDC6303Contract
{
/**
* @Column(type="simple_array", nullable=true)
*
* @var array
*/
/** @Column(type="simple_array", nullable=true) */
public $originalData;
}