RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-03-30 11:40:15 +03:00
Code Issues Projects Releases Wiki Activity

#1229 - code style fixes (alignment/spacing)

Browse source
This commit is contained in:
Marco Pivetta 2015-02-16 02:06:22 +00:00
parent baeab5d4f4
commit 1f67218dc5
3 changed files with 128 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/Doctrine/ORM/Mapping/Builder/AssociationBuilder.php
View file

@ -186,11 +186,12 @@ class AssociationBuilder
/**
* Sets field as primary key.
*
* @return AssociationBuilder
* @return self
*/
public function isPrimaryKey()
{
$this->mapping['id'] = true;
return $this;
}

2
lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
View file

@ -1461,7 +1461,7 @@ class ClassMetadataInfo implements ClassMetadata
}
if ( ! in_array($mapping['fieldName'], $this->identifier)) {
if (!isset($mapping['joinColumns'])) {
if (! isset($mapping['joinColumns'])) {
throw MappingException::illegalInverseIdentifierAssociation($this->name, $mapping['fieldName']);
}

52
tests/Doctrine/Tests/ORM/Mapping/ClassMetadataBuilderTest.php
View file

@ -335,7 +335,9 @@ class ClassMetadataBuilderTest extends \Doctrine\Tests\OrmTestCase
public function testCreateManyToOneWithIdentity()
{
$this->assertIsFluent(
$this->builder->createManyToOne('groups', 'Doctrine\Tests\Models\CMS\CmsGroup')
$this
->builder
->createManyToOne('groups', 'Doctrine\Tests\Models\CMS\CmsGroup')
->addJoinColumn('group_id', 'id', true, false, 'CASCADE')
->cascadeAll()
->fetchExtraLazy()
@ -343,10 +345,12 @@ class ClassMetadataBuilderTest extends \Doctrine\Tests\OrmTestCase
->build()
);
$this->assertEquals(array('groups' => array (
$this->assertEquals(
array(
'groups' => array(
'fieldName' => 'groups',
'targetEntity' => 'Doctrine\\Tests\\Models\\CMS\\CmsGroup',
'cascade' => array (
'cascade' => array(
0 => 'remove',
1 => 'persist',
2 => 'refresh',
@ -354,9 +358,9 @@ class ClassMetadataBuilderTest extends \Doctrine\Tests\OrmTestCase
4 => 'detach',
),
'fetch' => 4,
'joinColumns' => array (
'joinColumns' => array(
0 =>
array (
array(
'name' => 'group_id',
'referencedColumnName' => 'id',
'nullable' => true,
@ -376,21 +380,23 @@ class ClassMetadataBuilderTest extends \Doctrine\Tests\OrmTestCase
'isCascadeMerge' => true,
'isCascadeDetach' => true,
'sourceToTargetKeyColumns' =>
array (
array(
'group_id' => 'id',
),
'joinColumnFieldNames' =>
array (
array(
'group_id' => 'group_id',
),
'targetToSourceKeyColumns' =>
array (
array(
'id' => 'group_id',
),
'orphanRemoval' => false,
'id' => true
),
), $this->cm->associationMappings);
),
$this->cm->associationMappings
);
}
public function testCreateOneToOne()
@ -455,7 +461,9 @@ class ClassMetadataBuilderTest extends \Doctrine\Tests\OrmTestCase
public function testCreateOneToOneWithIdentity()
{
$this->assertIsFluent(
$this->builder->createOneToOne('groups', 'Doctrine\Tests\Models\CMS\CmsGroup')
$this
->builder
->createOneToOne('groups', 'Doctrine\Tests\Models\CMS\CmsGroup')
->addJoinColumn('group_id', 'id', true, false, 'CASCADE')
->cascadeAll()
->fetchExtraLazy()
@ -463,10 +471,12 @@ class ClassMetadataBuilderTest extends \Doctrine\Tests\OrmTestCase
->build()
);
$this->assertEquals(array('groups' => array (
$this->assertEquals(
array(
'groups' => array(
'fieldName' => 'groups',
'targetEntity' => 'Doctrine\\Tests\\Models\\CMS\\CmsGroup',
'cascade' => array (
'cascade' => array(
0 => 'remove',
1 => 'persist',
2 => 'refresh',
@ -475,9 +485,9 @@ class ClassMetadataBuilderTest extends \Doctrine\Tests\OrmTestCase
),
'fetch' => 4,
'id' => true,
'joinColumns' => array (
'joinColumns' => array(
0 =>
array (
array(
'name' => 'group_id',
'referencedColumnName' => 'id',
'nullable' => true,
@ -497,27 +507,31 @@ class ClassMetadataBuilderTest extends \Doctrine\Tests\OrmTestCase
'isCascadeMerge' => true,
'isCascadeDetach' => true,
'sourceToTargetKeyColumns' =>
array (
array(
'group_id' => 'id',
),
'joinColumnFieldNames' =>
array (
array(
'group_id' => 'group_id',
),
'targetToSourceKeyColumns' =>
array (
array(
'id' => 'group_id',
),
'orphanRemoval' => false
),
), $this->cm->associationMappings);
),
$this->cm->associationMappings
);
}
public function testThrowsExceptionOnCreateOneToOneWithIdentityOnInverseSide()
{
$this->setExpectedException('Doctrine\ORM\Mapping\MappingException');
$this->builder->createOneToOne('groups', 'Doctrine\Tests\Models\CMS\CmsGroup')
$this
->builder
->createOneToOne('groups', 'Doctrine\Tests\Models\CMS\CmsGroup')
->mappedBy('test')
->fetchExtraLazy()
->isPrimaryKey()