@@ -68,8 +68,8 @@ discard block |
||
68 | 68 | $cm->mapField(['fieldName' => 'name', 'columnName' => '`name`']); |
69 | 69 | $cm->mapField(['fieldName' => 'id', 'columnName' => 'id']); |
70 | 70 | |
71 | - $this->assertEquals('id' ,$this->strategy->getColumnName('id', $cm, $this->platform)); |
|
72 | - $this->assertEquals('"name"' ,$this->strategy->getColumnName('name', $cm, $this->platform)); |
|
71 | + $this->assertEquals('id', $this->strategy->getColumnName('id', $cm, $this->platform)); |
|
72 | + $this->assertEquals('"name"', $this->strategy->getColumnName('name', $cm, $this->platform)); |
|
73 | 73 | } |
74 | 74 | |
75 | 75 | public function testGetTableName() |
@@ -189,7 +189,7 @@ discard block |
||
189 | 189 | ); |
190 | 190 | |
191 | 191 | $joinColumn = $cm->associationMappings['article']['joinColumns'][0]; |
192 | - $this->assertEquals('"article"',$this->strategy->getJoinColumnName($joinColumn, $cm, $this->platform)); |
|
192 | + $this->assertEquals('"article"', $this->strategy->getJoinColumnName($joinColumn, $cm, $this->platform)); |
|
193 | 193 | } |
194 | 194 | |
195 | 195 | public function testReferencedJoinColumnName() |
@@ -210,7 +210,7 @@ discard block |
||
210 | 210 | ); |
211 | 211 | |
212 | 212 | $joinColumn = $cm->associationMappings['article']['joinColumns'][0]; |
213 | - $this->assertEquals('"id"',$this->strategy->getReferencedJoinColumnName($joinColumn, $cm, $this->platform)); |
|
213 | + $this->assertEquals('"id"', $this->strategy->getReferencedJoinColumnName($joinColumn, $cm, $this->platform)); |
|
214 | 214 | } |
215 | 215 | } |
216 | 216 |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | protected function _loadDriverForCMSModels() |
116 | 116 | { |
117 | 117 | $annotationDriver = $this->_loadDriver(); |
118 | - $annotationDriver->addPaths([__DIR__ . '/../../Models/CMS/']); |
|
118 | + $annotationDriver->addPaths([__DIR__.'/../../Models/CMS/']); |
|
119 | 119 | return $annotationDriver; |
120 | 120 | } |
121 | 121 | |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | public function testJoinTablesWithMappedSuperclassForAnnotationDriver() |
138 | 138 | { |
139 | 139 | $annotationDriver = $this->_loadDriver(); |
140 | - $annotationDriver->addPaths([__DIR__ . '/../../Models/DirectoryTree/']); |
|
140 | + $annotationDriver->addPaths([__DIR__.'/../../Models/DirectoryTree/']); |
|
141 | 141 | |
142 | 142 | $em = $this->_getTestEntityManager(); |
143 | 143 | $em->getConfiguration()->setMetadataDriverImpl($annotationDriver); |
@@ -165,7 +165,7 @@ discard block |
||
165 | 165 | |
166 | 166 | $this->expectException(MappingException::class); |
167 | 167 | $this->expectExceptionMessage( |
168 | - "It is illegal to put an inverse side one-to-many or many-to-many association on " . |
|
168 | + "It is illegal to put an inverse side one-to-many or many-to-many association on ". |
|
169 | 169 | "mapped superclass 'Doctrine\Tests\ORM\Mapping\InvalidMappedSuperClass#users'" |
170 | 170 | ); |
171 | 171 | |
@@ -186,8 +186,8 @@ discard block |
||
186 | 186 | |
187 | 187 | $this->expectException(MappingException::class); |
188 | 188 | $this->expectExceptionMessage( |
189 | - "It is not supported to define inheritance information on a mapped " . |
|
190 | - "superclass '" . MappedSuperClassInheritence::class . "'." |
|
189 | + "It is not supported to define inheritance information on a mapped ". |
|
190 | + "superclass '".MappedSuperClassInheritence::class."'." |
|
191 | 191 | ); |
192 | 192 | |
193 | 193 | $usingInvalidMsc = $factory->getMetadataFor(MappedSuperClassInheritence::class); |
@@ -245,7 +245,7 @@ discard block |
||
245 | 245 | |
246 | 246 | public function testAttributeOverridesMappingWithTrait() |
247 | 247 | { |
248 | - $factory = $this->createClassMetadataFactory(); |
|
248 | + $factory = $this->createClassMetadataFactory(); |
|
249 | 249 | |
250 | 250 | $metadataWithoutOverride = $factory->getMetadataFor(DDC1872ExampleEntityWithoutOverride::class); |
251 | 251 | $metadataWithOverride = $factory->getMetadataFor(DDC1872ExampleEntityWithOverride::class); |
@@ -51,7 +51,7 @@ |
||
51 | 51 | public function testFindMappingNamespaceNotFound() |
52 | 52 | { |
53 | 53 | $this->expectException(MappingException::class); |
54 | - $this->expectExceptionMessage("No mapping file found named 'Foo" . $this->getFileExtension() . "' for class 'MyOtherNamespace\MySubnamespace\Entity\Foo'."); |
|
54 | + $this->expectExceptionMessage("No mapping file found named 'Foo".$this->getFileExtension()."' for class 'MyOtherNamespace\MySubnamespace\Entity\Foo'."); |
|
55 | 55 | |
56 | 56 | $driver = $this->getDriver( |
57 | 57 | [ |
@@ -10,7 +10,7 @@ |
||
10 | 10 | { |
11 | 11 | protected function _loadDriver() |
12 | 12 | { |
13 | - return new StaticPHPDriver(__DIR__ . DIRECTORY_SEPARATOR . 'php'); |
|
13 | + return new StaticPHPDriver(__DIR__.DIRECTORY_SEPARATOR.'php'); |
|
14 | 14 | } |
15 | 15 | |
16 | 16 | /** |
@@ -15,7 +15,7 @@ |
||
15 | 15 | public function joinColumnName($propertyName, $className = null) |
16 | 16 | { |
17 | 17 | return strtolower($this->classToTableName($className)) |
18 | - . '_' . $propertyName |
|
19 | - . '_' . $this->referenceColumnName(); |
|
18 | + . '_'.$propertyName |
|
19 | + . '_'.$this->referenceColumnName(); |
|
20 | 20 | } |
21 | 21 | } |
@@ -55,8 +55,8 @@ discard block |
||
55 | 55 | $class->mapField(['fieldName' => 'name', 'columnName' => 'name']); |
56 | 56 | $class->mapField(['fieldName' => 'id', 'columnName' => 'id', 'id' => true]); |
57 | 57 | |
58 | - $this->assertEquals('id' ,$this->strategy->getColumnName('id', $class, $this->platform)); |
|
59 | - $this->assertEquals('name' ,$this->strategy->getColumnName('name', $class, $this->platform)); |
|
58 | + $this->assertEquals('id', $this->strategy->getColumnName('id', $class, $this->platform)); |
|
59 | + $this->assertEquals('name', $this->strategy->getColumnName('name', $class, $this->platform)); |
|
60 | 60 | } |
61 | 61 | |
62 | 62 | public function testGetTableName() |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | $class = $this->createClassMetadata(CmsUser::class); |
65 | 65 | |
66 | 66 | $class->setPrimaryTable(['name'=>'cms_user']); |
67 | - $this->assertEquals('cms_user' ,$this->strategy->getTableName($class, $this->platform)); |
|
67 | + $this->assertEquals('cms_user', $this->strategy->getTableName($class, $this->platform)); |
|
68 | 68 | } |
69 | 69 | |
70 | 70 | public function testJoinTableName() |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | ); |
126 | 126 | |
127 | 127 | $joinColumn = $class->associationMappings['article']['joinColumns'][0]; |
128 | - $this->assertEquals('article',$this->strategy->getJoinColumnName($joinColumn, $class, $this->platform)); |
|
128 | + $this->assertEquals('article', $this->strategy->getJoinColumnName($joinColumn, $class, $this->platform)); |
|
129 | 129 | } |
130 | 130 | |
131 | 131 | public function testReferencedJoinColumnName() |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | ); |
147 | 147 | |
148 | 148 | $joinColumn = $cm->associationMappings['article']['joinColumns'][0]; |
149 | - $this->assertEquals('id',$this->strategy->getReferencedJoinColumnName($joinColumn, $cm, $this->platform)); |
|
149 | + $this->assertEquals('id', $this->strategy->getReferencedJoinColumnName($joinColumn, $cm, $this->platform)); |
|
150 | 150 | } |
151 | 151 | |
152 | 152 | public function testGetSequenceName() |
@@ -160,6 +160,6 @@ discard block |
||
160 | 160 | |
161 | 161 | $class->setSequenceGeneratorDefinition($definition); |
162 | 162 | |
163 | - $this->assertEquals('user_id_seq',$this->strategy->getSequenceName($definition, $class, $this->platform)); |
|
163 | + $this->assertEquals('user_id_seq', $this->strategy->getSequenceName($definition, $class, $this->platform)); |
|
164 | 164 | } |
165 | 165 | } |
@@ -11,7 +11,7 @@ |
||
11 | 11 | { |
12 | 12 | protected function _loadDriver() |
13 | 13 | { |
14 | - $path = __DIR__ . DIRECTORY_SEPARATOR . 'php'; |
|
14 | + $path = __DIR__.DIRECTORY_SEPARATOR.'php'; |
|
15 | 15 | |
16 | 16 | // Convert Annotation mapping information to PHP |
17 | 17 | // Uncomment this code if annotations changed and you want to update the PHP code |
@@ -5,7 +5,7 @@ discard block |
||
5 | 5 | |
6 | 6 | $metadata->setPrimaryTable( |
7 | 7 | [ |
8 | - 'name' => 'company_person', |
|
8 | + 'name' => 'company_person', |
|
9 | 9 | ] |
10 | 10 | ); |
11 | 11 | |
@@ -71,18 +71,18 @@ discard block |
||
71 | 71 | 'entities' => [ |
72 | 72 | [ |
73 | 73 | 'fields' => [ |
74 | - [ |
|
74 | + [ |
|
75 | 75 | 'name' => 'id', |
76 | 76 | 'column' => 'id', |
77 | - ], |
|
78 | - [ |
|
77 | + ], |
|
78 | + [ |
|
79 | 79 | 'name' => 'city', |
80 | 80 | 'column' => 'city', |
81 | - ], |
|
82 | - [ |
|
81 | + ], |
|
82 | + [ |
|
83 | 83 | 'name' => 'country', |
84 | 84 | 'column' => 'country', |
85 | - ], |
|
85 | + ], |
|
86 | 86 | ], |
87 | 87 | 'entityClass' => CmsAddress::class, |
88 | 88 | ], |
@@ -3,7 +3,7 @@ |
||
3 | 3 | use Doctrine\ORM\Mapping\ClassMetadataInfo; |
4 | 4 | |
5 | 5 | $metadata->setInheritanceType(ClassMetadataInfo::INHERITANCE_TYPE_JOINED); |
6 | -$metadata->setTableName( 'company_contracts'); |
|
6 | +$metadata->setTableName('company_contracts'); |
|
7 | 7 | $metadata->setDiscriminatorColumn( |
8 | 8 | [ |
9 | 9 | 'name' => 'discr', |