@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | $cacheAnnot = $classAnnotations[Mapping\Cache::class]; |
150 | 150 | $cacheMap = [ |
151 | 151 | 'region' => $cacheAnnot->region, |
152 | - 'usage' => constant('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_' . $cacheAnnot->usage), |
|
152 | + 'usage' => constant('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_'.$cacheAnnot->usage), |
|
153 | 153 | ]; |
154 | 154 | |
155 | 155 | $metadata->enableCache($cacheMap); |
@@ -237,7 +237,7 @@ discard block |
||
237 | 237 | $inheritanceTypeAnnot = $classAnnotations[Mapping\InheritanceType::class]; |
238 | 238 | |
239 | 239 | $metadata->setInheritanceType( |
240 | - constant('Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_' . $inheritanceTypeAnnot->value) |
|
240 | + constant('Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_'.$inheritanceTypeAnnot->value) |
|
241 | 241 | ); |
242 | 242 | |
243 | 243 | if ($metadata->inheritanceType != Mapping\ClassMetadata::INHERITANCE_TYPE_NONE) { |
@@ -269,7 +269,7 @@ discard block |
||
269 | 269 | // Evaluate DoctrineChangeTrackingPolicy annotation |
270 | 270 | if (isset($classAnnotations[Mapping\ChangeTrackingPolicy::class])) { |
271 | 271 | $changeTrackingAnnot = $classAnnotations[Mapping\ChangeTrackingPolicy::class]; |
272 | - $metadata->setChangeTrackingPolicy(constant('Doctrine\ORM\Mapping\ClassMetadata::CHANGETRACKING_' . $changeTrackingAnnot->value)); |
|
272 | + $metadata->setChangeTrackingPolicy(constant('Doctrine\ORM\Mapping\ClassMetadata::CHANGETRACKING_'.$changeTrackingAnnot->value)); |
|
273 | 273 | } |
274 | 274 | |
275 | 275 | // Evaluate annotations on properties/fields |
@@ -293,7 +293,7 @@ discard block |
||
293 | 293 | $mapping['cache'] = $metadata->getAssociationCacheDefaults( |
294 | 294 | $mapping['fieldName'], |
295 | 295 | [ |
296 | - 'usage' => constant('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_' . $cacheAnnot->usage), |
|
296 | + 'usage' => constant('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_'.$cacheAnnot->usage), |
|
297 | 297 | 'region' => $cacheAnnot->region, |
298 | 298 | ] |
299 | 299 | ); |
@@ -323,7 +323,7 @@ discard block |
||
323 | 323 | } |
324 | 324 | |
325 | 325 | if ($generatedValueAnnot = $this->reader->getPropertyAnnotation($property, Mapping\GeneratedValue::class)) { |
326 | - $metadata->setIdGeneratorType(constant('Doctrine\ORM\Mapping\ClassMetadata::GENERATOR_TYPE_' . $generatedValueAnnot->strategy)); |
|
326 | + $metadata->setIdGeneratorType(constant('Doctrine\ORM\Mapping\ClassMetadata::GENERATOR_TYPE_'.$generatedValueAnnot->strategy)); |
|
327 | 327 | } |
328 | 328 | |
329 | 329 | if ($this->reader->getPropertyAnnotation($property, Mapping\Version::class)) { |
@@ -472,7 +472,7 @@ discard block |
||
472 | 472 | |
473 | 473 | // Check for `fetch` |
474 | 474 | if ($associationOverride->fetch) { |
475 | - $override['fetch'] = constant(Mapping\ClassMetadata::class . '::FETCH_' . $associationOverride->fetch); |
|
475 | + $override['fetch'] = constant(Mapping\ClassMetadata::class.'::FETCH_'.$associationOverride->fetch); |
|
476 | 476 | } |
477 | 477 | |
478 | 478 | $metadata->setAssociationOverride($fieldName, $override); |
@@ -516,7 +516,7 @@ discard block |
||
516 | 516 | } |
517 | 517 | |
518 | 518 | // Evaluate the listener using naming convention. |
519 | - if ( ! $hasMapping ) { |
|
519 | + if ( ! $hasMapping) { |
|
520 | 520 | EntityListenerBuilder::bindEntityListener($metadata, $listenerClassName); |
521 | 521 | } |
522 | 522 | } |
@@ -545,11 +545,11 @@ discard block |
||
545 | 545 | */ |
546 | 546 | private function getFetchMode($className, $fetchMode) |
547 | 547 | { |
548 | - if ( ! defined('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $fetchMode)) { |
|
548 | + if ( ! defined('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.$fetchMode)) { |
|
549 | 549 | throw MappingException::invalidFetchMode($className, $fetchMode); |
550 | 550 | } |
551 | 551 | |
552 | - return constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $fetchMode); |
|
552 | + return constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.$fetchMode); |
|
553 | 553 | } |
554 | 554 | |
555 | 555 | /** |
@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use Doctrine\Common\Cache\ArrayCache; |
6 | 6 | use Doctrine\Common\Collections\ArrayCollection; |
7 | - |
|
8 | 7 | use Doctrine\ORM\EntityManager; |
9 | 8 | use Doctrine\ORM\Internal\Hydration\IterableResult; |
10 | 9 | use Doctrine\ORM\Query\Parameter; |
@@ -85,18 +85,18 @@ discard block |
||
85 | 85 | { |
86 | 86 | $q = $this->_em->createQuery("select a from Doctrine\Tests\Models\CMS\CmsArticle a"); |
87 | 87 | $q2 = $q->expireQueryCache(true) |
88 | - ->setQueryCacheLifetime(3600) |
|
89 | - ->setQueryCacheDriver(null) |
|
90 | - ->expireResultCache(true) |
|
91 | - ->setHint('foo', 'bar') |
|
92 | - ->setHint('bar', 'baz') |
|
93 | - ->setParameter(1, 'bar') |
|
94 | - ->setParameters(new ArrayCollection([new Parameter(2, 'baz')])) |
|
95 | - ->setResultCacheDriver(null) |
|
96 | - ->setResultCacheId('foo') |
|
97 | - ->setDQL('foo') |
|
98 | - ->setFirstResult(10) |
|
99 | - ->setMaxResults(10); |
|
88 | + ->setQueryCacheLifetime(3600) |
|
89 | + ->setQueryCacheDriver(null) |
|
90 | + ->expireResultCache(true) |
|
91 | + ->setHint('foo', 'bar') |
|
92 | + ->setHint('bar', 'baz') |
|
93 | + ->setParameter(1, 'bar') |
|
94 | + ->setParameters(new ArrayCollection([new Parameter(2, 'baz')])) |
|
95 | + ->setResultCacheDriver(null) |
|
96 | + ->setResultCacheId('foo') |
|
97 | + ->setDQL('foo') |
|
98 | + ->setFirstResult(10) |
|
99 | + ->setMaxResults(10); |
|
100 | 100 | |
101 | 101 | $this->assertSame($q2, $q); |
102 | 102 | } |
@@ -254,11 +254,11 @@ discard block |
||
254 | 254 | $this->_em->getConfiguration()->setResultCacheImpl(new ArrayCache()); |
255 | 255 | |
256 | 256 | $query = $this->_em->createQuery("SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u") |
257 | - ->useResultCache(true); |
|
257 | + ->useResultCache(true); |
|
258 | 258 | |
259 | 259 | /** @var DriverConnectionMock $driverConnectionMock */ |
260 | 260 | $driverConnectionMock = $this->_em->getConnection() |
261 | - ->getWrappedConnection(); |
|
261 | + ->getWrappedConnection(); |
|
262 | 262 | |
263 | 263 | $driverConnectionMock->setStatementMock(new StatementArrayMock([['id_0' => 1]])); |
264 | 264 |
@@ -163,7 +163,7 @@ discard block |
||
163 | 163 | 9 => "St Julien" |
164 | 164 | ]; |
165 | 165 | |
166 | - $query = $this->_em |
|
166 | + $query = $this->_em |
|
167 | 167 | ->createQuery("SELECT a FROM Doctrine\Tests\Models\CMS\CmsAddress a WHERE a.city IN (:cities)") |
168 | 168 | ->setParameter('cities', $cities); |
169 | 169 | |
@@ -179,7 +179,7 @@ discard block |
||
179 | 179 | */ |
180 | 180 | public function testProcessParameterValueClassMetadata() |
181 | 181 | { |
182 | - $query = $this->_em->createQuery("SELECT a FROM Doctrine\Tests\Models\CMS\CmsAddress a WHERE a.city IN (:cities)"); |
|
182 | + $query = $this->_em->createQuery("SELECT a FROM Doctrine\Tests\Models\CMS\CmsAddress a WHERE a.city IN (:cities)"); |
|
183 | 183 | $this->assertEquals( |
184 | 184 | CmsAddress::class, |
185 | 185 | $query->processParameterValue($this->_em->getClassMetadata(CmsAddress::class)) |
@@ -89,66 +89,66 @@ discard block |
||
89 | 89 | $cmf = $this->em->getMetadataFactory(); |
90 | 90 | |
91 | 91 | foreach ($class->fieldMappings as $fieldName => $mapping) { |
92 | - if (!Type::hasType($mapping['type'])) { |
|
93 | - $ce[] = "The field '" . $class->name . "#" . $fieldName."' uses a non-existent type '" . $mapping['type'] . "'."; |
|
92 | + if ( ! Type::hasType($mapping['type'])) { |
|
93 | + $ce[] = "The field '".$class->name."#".$fieldName."' uses a non-existent type '".$mapping['type']."'."; |
|
94 | 94 | } |
95 | 95 | } |
96 | 96 | |
97 | 97 | foreach ($class->associationMappings as $fieldName => $assoc) { |
98 | - if (!class_exists($assoc['targetEntity']) || $cmf->isTransient($assoc['targetEntity'])) { |
|
99 | - $ce[] = "The target entity '" . $assoc['targetEntity'] . "' specified on " . $class->name . '#' . $fieldName . ' is unknown or not an entity.'; |
|
98 | + if ( ! class_exists($assoc['targetEntity']) || $cmf->isTransient($assoc['targetEntity'])) { |
|
99 | + $ce[] = "The target entity '".$assoc['targetEntity']."' specified on ".$class->name.'#'.$fieldName.' is unknown or not an entity.'; |
|
100 | 100 | |
101 | 101 | return $ce; |
102 | 102 | } |
103 | 103 | |
104 | 104 | if ($assoc['mappedBy'] && $assoc['inversedBy']) { |
105 | - $ce[] = "The association " . $class . "#" . $fieldName . " cannot be defined as both inverse and owning."; |
|
105 | + $ce[] = "The association ".$class."#".$fieldName." cannot be defined as both inverse and owning."; |
|
106 | 106 | } |
107 | 107 | |
108 | 108 | $targetMetadata = $cmf->getMetadataFor($assoc['targetEntity']); |
109 | 109 | |
110 | 110 | if (isset($assoc['id']) && $targetMetadata->containsForeignIdentifier) { |
111 | - $ce[] = "Cannot map association '" . $class->name. "#". $fieldName ." as identifier, because " . |
|
112 | - "the target entity '". $targetMetadata->name . "' also maps an association as identifier."; |
|
111 | + $ce[] = "Cannot map association '".$class->name."#".$fieldName." as identifier, because ". |
|
112 | + "the target entity '".$targetMetadata->name."' also maps an association as identifier."; |
|
113 | 113 | } |
114 | 114 | |
115 | 115 | if ($assoc['mappedBy']) { |
116 | 116 | if ($targetMetadata->hasField($assoc['mappedBy'])) { |
117 | - $ce[] = "The association " . $class->name . "#" . $fieldName . " refers to the owning side ". |
|
118 | - "field " . $assoc['targetEntity'] . "#" . $assoc['mappedBy'] . " which is not defined as association, but as field."; |
|
117 | + $ce[] = "The association ".$class->name."#".$fieldName." refers to the owning side ". |
|
118 | + "field ".$assoc['targetEntity']."#".$assoc['mappedBy']." which is not defined as association, but as field."; |
|
119 | 119 | } |
120 | - if (!$targetMetadata->hasAssociation($assoc['mappedBy'])) { |
|
121 | - $ce[] = "The association " . $class->name . "#" . $fieldName . " refers to the owning side ". |
|
122 | - "field " . $assoc['targetEntity'] . "#" . $assoc['mappedBy'] . " which does not exist."; |
|
120 | + if ( ! $targetMetadata->hasAssociation($assoc['mappedBy'])) { |
|
121 | + $ce[] = "The association ".$class->name."#".$fieldName." refers to the owning side ". |
|
122 | + "field ".$assoc['targetEntity']."#".$assoc['mappedBy']." which does not exist."; |
|
123 | 123 | } elseif ($targetMetadata->associationMappings[$assoc['mappedBy']]['inversedBy'] == null) { |
124 | - $ce[] = "The field " . $class->name . "#" . $fieldName . " is on the inverse side of a ". |
|
124 | + $ce[] = "The field ".$class->name."#".$fieldName." is on the inverse side of a ". |
|
125 | 125 | "bi-directional relationship, but the specified mappedBy association on the target-entity ". |
126 | - $assoc['targetEntity'] . "#" . $assoc['mappedBy'] . " does not contain the required ". |
|
127 | - "'inversedBy=\"" . $fieldName . "\"' attribute."; |
|
126 | + $assoc['targetEntity']."#".$assoc['mappedBy']." does not contain the required ". |
|
127 | + "'inversedBy=\"".$fieldName."\"' attribute."; |
|
128 | 128 | } elseif ($targetMetadata->associationMappings[$assoc['mappedBy']]['inversedBy'] != $fieldName) { |
129 | - $ce[] = "The mappings " . $class->name . "#" . $fieldName . " and " . |
|
130 | - $assoc['targetEntity'] . "#" . $assoc['mappedBy'] . " are ". |
|
129 | + $ce[] = "The mappings ".$class->name."#".$fieldName." and ". |
|
130 | + $assoc['targetEntity']."#".$assoc['mappedBy']." are ". |
|
131 | 131 | "inconsistent with each other."; |
132 | 132 | } |
133 | 133 | } |
134 | 134 | |
135 | 135 | if ($assoc['inversedBy']) { |
136 | 136 | if ($targetMetadata->hasField($assoc['inversedBy'])) { |
137 | - $ce[] = "The association " . $class->name . "#" . $fieldName . " refers to the inverse side ". |
|
138 | - "field " . $assoc['targetEntity'] . "#" . $assoc['inversedBy'] . " which is not defined as association."; |
|
137 | + $ce[] = "The association ".$class->name."#".$fieldName." refers to the inverse side ". |
|
138 | + "field ".$assoc['targetEntity']."#".$assoc['inversedBy']." which is not defined as association."; |
|
139 | 139 | } |
140 | 140 | |
141 | - if (!$targetMetadata->hasAssociation($assoc['inversedBy'])) { |
|
142 | - $ce[] = "The association " . $class->name . "#" . $fieldName . " refers to the inverse side ". |
|
143 | - "field " . $assoc['targetEntity'] . "#" . $assoc['inversedBy'] . " which does not exist."; |
|
141 | + if ( ! $targetMetadata->hasAssociation($assoc['inversedBy'])) { |
|
142 | + $ce[] = "The association ".$class->name."#".$fieldName." refers to the inverse side ". |
|
143 | + "field ".$assoc['targetEntity']."#".$assoc['inversedBy']." which does not exist."; |
|
144 | 144 | } elseif ($targetMetadata->associationMappings[$assoc['inversedBy']]['mappedBy'] == null) { |
145 | - $ce[] = "The field " . $class->name . "#" . $fieldName . " is on the owning side of a ". |
|
145 | + $ce[] = "The field ".$class->name."#".$fieldName." is on the owning side of a ". |
|
146 | 146 | "bi-directional relationship, but the specified mappedBy association on the target-entity ". |
147 | - $assoc['targetEntity'] . "#" . $assoc['mappedBy'] . " does not contain the required ". |
|
147 | + $assoc['targetEntity']."#".$assoc['mappedBy']." does not contain the required ". |
|
148 | 148 | "'inversedBy' attribute."; |
149 | 149 | } elseif ($targetMetadata->associationMappings[$assoc['inversedBy']]['mappedBy'] != $fieldName) { |
150 | - $ce[] = "The mappings " . $class->name . "#" . $fieldName . " and " . |
|
151 | - $assoc['targetEntity'] . "#" . $assoc['inversedBy'] . " are ". |
|
150 | + $ce[] = "The mappings ".$class->name."#".$fieldName." and ". |
|
151 | + $assoc['targetEntity']."#".$assoc['inversedBy']." are ". |
|
152 | 152 | "inconsistent with each other."; |
153 | 153 | } |
154 | 154 | |
@@ -156,14 +156,14 @@ discard block |
||
156 | 156 | if (array_key_exists($assoc['inversedBy'], $targetMetadata->associationMappings)) { |
157 | 157 | $targetAssoc = $targetMetadata->associationMappings[$assoc['inversedBy']]; |
158 | 158 | if ($assoc['type'] == ClassMetadataInfo::ONE_TO_ONE && $targetAssoc['type'] !== ClassMetadataInfo::ONE_TO_ONE) { |
159 | - $ce[] = "If association " . $class->name . "#" . $fieldName . " is one-to-one, then the inversed " . |
|
160 | - "side " . $targetMetadata->name . "#" . $assoc['inversedBy'] . " has to be one-to-one as well."; |
|
159 | + $ce[] = "If association ".$class->name."#".$fieldName." is one-to-one, then the inversed ". |
|
160 | + "side ".$targetMetadata->name."#".$assoc['inversedBy']." has to be one-to-one as well."; |
|
161 | 161 | } elseif ($assoc['type'] == ClassMetadataInfo::MANY_TO_ONE && $targetAssoc['type'] !== ClassMetadataInfo::ONE_TO_MANY) { |
162 | - $ce[] = "If association " . $class->name . "#" . $fieldName . " is many-to-one, then the inversed " . |
|
163 | - "side " . $targetMetadata->name . "#" . $assoc['inversedBy'] . " has to be one-to-many."; |
|
162 | + $ce[] = "If association ".$class->name."#".$fieldName." is many-to-one, then the inversed ". |
|
163 | + "side ".$targetMetadata->name."#".$assoc['inversedBy']." has to be one-to-many."; |
|
164 | 164 | } elseif ($assoc['type'] == ClassMetadataInfo::MANY_TO_MANY && $targetAssoc['type'] !== ClassMetadataInfo::MANY_TO_MANY) { |
165 | - $ce[] = "If association " . $class->name . "#" . $fieldName . " is many-to-many, then the inversed " . |
|
166 | - "side " . $targetMetadata->name . "#" . $assoc['inversedBy'] . " has to be many-to-many as well."; |
|
165 | + $ce[] = "If association ".$class->name."#".$fieldName." is many-to-many, then the inversed ". |
|
166 | + "side ".$targetMetadata->name."#".$assoc['inversedBy']." has to be many-to-many as well."; |
|
167 | 167 | } |
168 | 168 | } |
169 | 169 | } |
@@ -172,8 +172,8 @@ discard block |
||
172 | 172 | if ($assoc['type'] == ClassMetadataInfo::MANY_TO_MANY) { |
173 | 173 | $identifierColumns = $class->getIdentifierColumnNames(); |
174 | 174 | foreach ($assoc['joinTable']['joinColumns'] as $joinColumn) { |
175 | - if (!in_array($joinColumn['referencedColumnName'], $identifierColumns)) { |
|
176 | - $ce[] = "The referenced column name '" . $joinColumn['referencedColumnName'] . "' " . |
|
175 | + if ( ! in_array($joinColumn['referencedColumnName'], $identifierColumns)) { |
|
176 | + $ce[] = "The referenced column name '".$joinColumn['referencedColumnName']."' ". |
|
177 | 177 | "has to be a primary key column on the target entity class '".$class->name."'."; |
178 | 178 | break; |
179 | 179 | } |
@@ -181,32 +181,32 @@ discard block |
||
181 | 181 | |
182 | 182 | $identifierColumns = $targetMetadata->getIdentifierColumnNames(); |
183 | 183 | foreach ($assoc['joinTable']['inverseJoinColumns'] as $inverseJoinColumn) { |
184 | - if (!in_array($inverseJoinColumn['referencedColumnName'], $identifierColumns)) { |
|
185 | - $ce[] = "The referenced column name '" . $joinColumn['referencedColumnName'] . "' " . |
|
184 | + if ( ! in_array($inverseJoinColumn['referencedColumnName'], $identifierColumns)) { |
|
185 | + $ce[] = "The referenced column name '".$joinColumn['referencedColumnName']."' ". |
|
186 | 186 | "has to be a primary key column on the target entity class '".$targetMetadata->name."'."; |
187 | 187 | break; |
188 | 188 | } |
189 | 189 | } |
190 | 190 | |
191 | 191 | if (count($targetMetadata->getIdentifierColumnNames()) != count($assoc['joinTable']['inverseJoinColumns'])) { |
192 | - $ce[] = "The inverse join columns of the many-to-many table '" . $assoc['joinTable']['name'] . "' " . |
|
193 | - "have to contain to ALL identifier columns of the target entity '". $targetMetadata->name . "', " . |
|
194 | - "however '" . implode(", ", array_diff($targetMetadata->getIdentifierColumnNames(), array_values($assoc['relationToTargetKeyColumns']))) . |
|
192 | + $ce[] = "The inverse join columns of the many-to-many table '".$assoc['joinTable']['name']."' ". |
|
193 | + "have to contain to ALL identifier columns of the target entity '".$targetMetadata->name."', ". |
|
194 | + "however '".implode(", ", array_diff($targetMetadata->getIdentifierColumnNames(), array_values($assoc['relationToTargetKeyColumns']))). |
|
195 | 195 | "' are missing."; |
196 | 196 | } |
197 | 197 | |
198 | 198 | if (count($class->getIdentifierColumnNames()) != count($assoc['joinTable']['joinColumns'])) { |
199 | - $ce[] = "The join columns of the many-to-many table '" . $assoc['joinTable']['name'] . "' " . |
|
200 | - "have to contain to ALL identifier columns of the source entity '". $class->name . "', " . |
|
201 | - "however '" . implode(", ", array_diff($class->getIdentifierColumnNames(), array_values($assoc['relationToSourceKeyColumns']))) . |
|
199 | + $ce[] = "The join columns of the many-to-many table '".$assoc['joinTable']['name']."' ". |
|
200 | + "have to contain to ALL identifier columns of the source entity '".$class->name."', ". |
|
201 | + "however '".implode(", ", array_diff($class->getIdentifierColumnNames(), array_values($assoc['relationToSourceKeyColumns']))). |
|
202 | 202 | "' are missing."; |
203 | 203 | } |
204 | 204 | |
205 | 205 | } elseif ($assoc['type'] & ClassMetadataInfo::TO_ONE) { |
206 | 206 | $identifierColumns = $targetMetadata->getIdentifierColumnNames(); |
207 | 207 | foreach ($assoc['joinColumns'] as $joinColumn) { |
208 | - if (!in_array($joinColumn['referencedColumnName'], $identifierColumns)) { |
|
209 | - $ce[] = "The referenced column name '" . $joinColumn['referencedColumnName'] . "' " . |
|
208 | + if ( ! in_array($joinColumn['referencedColumnName'], $identifierColumns)) { |
|
209 | + $ce[] = "The referenced column name '".$joinColumn['referencedColumnName']."' ". |
|
210 | 210 | "has to be a primary key column on the target entity class '".$targetMetadata->name."'."; |
211 | 211 | } |
212 | 212 | } |
@@ -218,9 +218,9 @@ discard block |
||
218 | 218 | $ids[] = $joinColumn['name']; |
219 | 219 | } |
220 | 220 | |
221 | - $ce[] = "The join columns of the association '" . $assoc['fieldName'] . "' " . |
|
222 | - "have to match to ALL identifier columns of the target entity '". $targetMetadata->name . "', " . |
|
223 | - "however '" . implode(", ", array_diff($targetMetadata->getIdentifierColumnNames(), $ids)) . |
|
221 | + $ce[] = "The join columns of the association '".$assoc['fieldName']."' ". |
|
222 | + "have to match to ALL identifier columns of the target entity '".$targetMetadata->name."', ". |
|
223 | + "however '".implode(", ", array_diff($targetMetadata->getIdentifierColumnNames(), $ids)). |
|
224 | 224 | "' are missing."; |
225 | 225 | } |
226 | 226 | } |
@@ -228,19 +228,19 @@ discard block |
||
228 | 228 | |
229 | 229 | if (isset($assoc['orderBy']) && $assoc['orderBy'] !== null) { |
230 | 230 | foreach ($assoc['orderBy'] as $orderField => $orientation) { |
231 | - if (!$targetMetadata->hasField($orderField) && !$targetMetadata->hasAssociation($orderField)) { |
|
232 | - $ce[] = "The association " . $class->name."#".$fieldName." is ordered by a foreign field " . |
|
233 | - $orderField . " that is not a field on the target entity " . $targetMetadata->name . "."; |
|
231 | + if ( ! $targetMetadata->hasField($orderField) && ! $targetMetadata->hasAssociation($orderField)) { |
|
232 | + $ce[] = "The association ".$class->name."#".$fieldName." is ordered by a foreign field ". |
|
233 | + $orderField." that is not a field on the target entity ".$targetMetadata->name."."; |
|
234 | 234 | continue; |
235 | 235 | } |
236 | 236 | if ($targetMetadata->isCollectionValuedAssociation($orderField)) { |
237 | - $ce[] = "The association " . $class->name."#".$fieldName." is ordered by a field " . |
|
238 | - $orderField . " on " . $targetMetadata->name . " that is a collection-valued association."; |
|
237 | + $ce[] = "The association ".$class->name."#".$fieldName." is ordered by a field ". |
|
238 | + $orderField." on ".$targetMetadata->name." that is a collection-valued association."; |
|
239 | 239 | continue; |
240 | 240 | } |
241 | 241 | if ($targetMetadata->isAssociationInverseSide($orderField)) { |
242 | - $ce[] = "The association " . $class->name."#".$fieldName." is ordered by a field " . |
|
243 | - $orderField . " on " . $targetMetadata->name . " that is the inverse side of an association."; |
|
242 | + $ce[] = "The association ".$class->name."#".$fieldName." is ordered by a field ". |
|
243 | + $orderField." on ".$targetMetadata->name." that is the inverse side of an association."; |
|
244 | 244 | continue; |
245 | 245 | } |
246 | 246 | } |
@@ -248,9 +248,9 @@ discard block |
||
248 | 248 | } |
249 | 249 | |
250 | 250 | foreach ($class->subClasses as $subClass) { |
251 | - if (!in_array($class->name, class_parents($subClass))) { |
|
252 | - $ce[] = "According to the discriminator map class '" . $subClass . "' has to be a child ". |
|
253 | - "of '" . $class->name . "' but these entities are not related through inheritance."; |
|
251 | + if ( ! in_array($class->name, class_parents($subClass))) { |
|
252 | + $ce[] = "According to the discriminator map class '".$subClass."' has to be a child ". |
|
253 | + "of '".$class->name."' but these entities are not related through inheritance."; |
|
254 | 254 | } |
255 | 255 | } |
256 | 256 |
@@ -199,7 +199,7 @@ discard block |
||
199 | 199 | $class->reflFields[$fieldName]->setValue($entity, $value); |
200 | 200 | $this->_uow->setOriginalEntityProperty($oid, $fieldName, $value); |
201 | 201 | |
202 | - $this->initializedCollections[$oid . $fieldName] = $value; |
|
202 | + $this->initializedCollections[$oid.$fieldName] = $value; |
|
203 | 203 | } else if ( |
204 | 204 | isset($this->_hints[Query::HINT_REFRESH]) || |
205 | 205 | isset($this->_hints['fetched'][$parentDqlAlias][$fieldName]) && |
@@ -210,10 +210,10 @@ discard block |
||
210 | 210 | $value->setInitialized(true); |
211 | 211 | $value->unwrap()->clear(); |
212 | 212 | |
213 | - $this->initializedCollections[$oid . $fieldName] = $value; |
|
213 | + $this->initializedCollections[$oid.$fieldName] = $value; |
|
214 | 214 | } else { |
215 | 215 | // Is already PersistentCollection, and DON'T REFRESH or FETCH-JOIN! |
216 | - $this->existingCollections[$oid . $fieldName] = $value; |
|
216 | + $this->existingCollections[$oid.$fieldName] = $value; |
|
217 | 217 | } |
218 | 218 | |
219 | 219 | return $value; |
@@ -287,7 +287,7 @@ discard block |
||
287 | 287 | $idHash = ''; |
288 | 288 | |
289 | 289 | foreach ($class->identifier as $fieldName) { |
290 | - $idHash .= ' ' . (isset($class->associationMappings[$fieldName]) |
|
290 | + $idHash .= ' '.(isset($class->associationMappings[$fieldName]) |
|
291 | 291 | ? $data[$class->associationMappings[$fieldName]['joinColumns'][0]['name']] |
292 | 292 | : $data[$fieldName]); |
293 | 293 | } |
@@ -343,7 +343,7 @@ discard block |
||
343 | 343 | $parentAlias = $this->_rsm->parentAliasMap[$dqlAlias]; |
344 | 344 | // we need the $path to save into the identifier map which entities were already |
345 | 345 | // seen for this parent-child relationship |
346 | - $path = $parentAlias . '.' . $dqlAlias; |
|
346 | + $path = $parentAlias.'.'.$dqlAlias; |
|
347 | 347 | |
348 | 348 | // We have a RIGHT JOIN result here. Doctrine cannot hydrate RIGHT JOIN Object-Graphs |
349 | 349 | if ( ! isset($nonemptyComponents[$parentAlias])) { |
@@ -383,7 +383,7 @@ discard block |
||
383 | 383 | $reflFieldValue = $reflField->getValue($parentObject); |
384 | 384 | |
385 | 385 | if (isset($nonemptyComponents[$dqlAlias])) { |
386 | - $collKey = $oid . $relationField; |
|
386 | + $collKey = $oid.$relationField; |
|
387 | 387 | if (isset($this->initializedCollections[$collKey])) { |
388 | 388 | $reflFieldValue = $this->initializedCollections[$collKey]; |
389 | 389 | } else if ( ! isset($this->existingCollections[$collKey])) { |
@@ -431,7 +431,7 @@ discard block |
||
431 | 431 | // PATH B: Single-valued association |
432 | 432 | $reflFieldValue = $reflField->getValue($parentObject); |
433 | 433 | |
434 | - if ( ! $reflFieldValue || isset($this->_hints[Query::HINT_REFRESH]) || ($reflFieldValue instanceof Proxy && !$reflFieldValue->__isInitialized__)) { |
|
434 | + if ( ! $reflFieldValue || isset($this->_hints[Query::HINT_REFRESH]) || ($reflFieldValue instanceof Proxy && ! $reflFieldValue->__isInitialized__)) { |
|
435 | 435 | // we only need to take action if this value is null, |
436 | 436 | // we refresh the entity or its an uninitialized proxy. |
437 | 437 | if (isset($nonemptyComponents[$dqlAlias])) { |
@@ -476,7 +476,7 @@ discard block |
||
476 | 476 | $entityKey = $this->_rsm->entityMappings[$dqlAlias] ?: 0; |
477 | 477 | |
478 | 478 | // if this row has a NULL value for the root result id then make it a null result. |
479 | - if ( ! isset($nonemptyComponents[$dqlAlias]) ) { |
|
479 | + if ( ! isset($nonemptyComponents[$dqlAlias])) { |
|
480 | 480 | if ($this->_rsm->isMixed) { |
481 | 481 | $result[] = [$entityKey => null]; |
482 | 482 | } else { |
@@ -532,13 +532,13 @@ discard block |
||
532 | 532 | } |
533 | 533 | } |
534 | 534 | |
535 | - if ( ! isset($resultKey) ) { |
|
535 | + if ( ! isset($resultKey)) { |
|
536 | 536 | $this->resultCounter++; |
537 | 537 | } |
538 | 538 | |
539 | 539 | // Append scalar values to mixed result sets |
540 | 540 | if (isset($rowData['scalars'])) { |
541 | - if ( ! isset($resultKey) ) { |
|
541 | + if ( ! isset($resultKey)) { |
|
542 | 542 | $resultKey = (isset($this->_rsm->indexByMap['scalars'])) |
543 | 543 | ? $row[$this->_rsm->indexByMap['scalars']] |
544 | 544 | : $this->resultCounter - 1; |
@@ -551,19 +551,19 @@ discard block |
||
551 | 551 | |
552 | 552 | // Append new object to mixed result sets |
553 | 553 | if (isset($rowData['newObjects'])) { |
554 | - if ( ! isset($resultKey) ) { |
|
554 | + if ( ! isset($resultKey)) { |
|
555 | 555 | $resultKey = $this->resultCounter - 1; |
556 | 556 | } |
557 | 557 | |
558 | 558 | |
559 | - $scalarCount = (isset($rowData['scalars'])? count($rowData['scalars']): 0); |
|
559 | + $scalarCount = (isset($rowData['scalars']) ? count($rowData['scalars']) : 0); |
|
560 | 560 | |
561 | 561 | foreach ($rowData['newObjects'] as $objIndex => $newObject) { |
562 | 562 | $class = $newObject['class']; |
563 | 563 | $args = $newObject['args']; |
564 | 564 | $obj = $class->newInstanceArgs($args); |
565 | 565 | |
566 | - if ($scalarCount == 0 && count($rowData['newObjects']) == 1 ) { |
|
566 | + if ($scalarCount == 0 && count($rowData['newObjects']) == 1) { |
|
567 | 567 | $result[$resultKey] = $obj; |
568 | 568 | |
569 | 569 | continue; |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | // Evaluate named native queries |
110 | 110 | if (isset($element['namedNativeQueries'])) { |
111 | 111 | foreach ($element['namedNativeQueries'] as $name => $mappingElement) { |
112 | - if (!isset($mappingElement['name'])) { |
|
112 | + if ( ! isset($mappingElement['name'])) { |
|
113 | 113 | $mappingElement['name'] = $name; |
114 | 114 | } |
115 | 115 | $metadata->addNamedNativeQuery( |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | // Evaluate sql result set mappings |
127 | 127 | if (isset($element['sqlResultSetMappings'])) { |
128 | 128 | foreach ($element['sqlResultSetMappings'] as $name => $resultSetMapping) { |
129 | - if (!isset($resultSetMapping['name'])) { |
|
129 | + if ( ! isset($resultSetMapping['name'])) { |
|
130 | 130 | $resultSetMapping['name'] = $name; |
131 | 131 | } |
132 | 132 | |
@@ -173,7 +173,7 @@ discard block |
||
173 | 173 | } |
174 | 174 | |
175 | 175 | if (isset($element['inheritanceType'])) { |
176 | - $metadata->setInheritanceType(constant('Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_' . strtoupper($element['inheritanceType']))); |
|
176 | + $metadata->setInheritanceType(constant('Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_'.strtoupper($element['inheritanceType']))); |
|
177 | 177 | |
178 | 178 | if ($metadata->inheritanceType != Metadata::INHERITANCE_TYPE_NONE) { |
179 | 179 | // Evaluate discriminatorColumn |
@@ -362,7 +362,7 @@ discard block |
||
362 | 362 | } |
363 | 363 | |
364 | 364 | if (isset($oneToOneElement['fetch'])) { |
365 | - $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $oneToOneElement['fetch']); |
|
365 | + $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.$oneToOneElement['fetch']); |
|
366 | 366 | } |
367 | 367 | |
368 | 368 | if (isset($oneToOneElement['mappedBy'])) { |
@@ -416,7 +416,7 @@ discard block |
||
416 | 416 | ]; |
417 | 417 | |
418 | 418 | if (isset($oneToManyElement['fetch'])) { |
419 | - $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $oneToManyElement['fetch']); |
|
419 | + $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.$oneToManyElement['fetch']); |
|
420 | 420 | } |
421 | 421 | |
422 | 422 | if (isset($oneToManyElement['cascade'])) { |
@@ -458,7 +458,7 @@ discard block |
||
458 | 458 | } |
459 | 459 | |
460 | 460 | if (isset($manyToOneElement['fetch'])) { |
461 | - $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $manyToOneElement['fetch']); |
|
461 | + $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.$manyToOneElement['fetch']); |
|
462 | 462 | } |
463 | 463 | |
464 | 464 | if (isset($manyToOneElement['inversedBy'])) { |
@@ -503,7 +503,7 @@ discard block |
||
503 | 503 | ]; |
504 | 504 | |
505 | 505 | if (isset($manyToManyElement['fetch'])) { |
506 | - $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $manyToManyElement['fetch']); |
|
506 | + $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.$manyToManyElement['fetch']); |
|
507 | 507 | } |
508 | 508 | |
509 | 509 | if (isset($manyToManyElement['mappedBy'])) { |
@@ -573,7 +573,7 @@ discard block |
||
573 | 573 | if (isset($element['associationOverride']) && is_array($element['associationOverride'])) { |
574 | 574 | |
575 | 575 | foreach ($element['associationOverride'] as $fieldName => $associationOverrideElement) { |
576 | - $override = []; |
|
576 | + $override = []; |
|
577 | 577 | |
578 | 578 | // Check for joinColumn |
579 | 579 | if (isset($associationOverrideElement['joinColumn'])) { |
@@ -591,7 +591,7 @@ discard block |
||
591 | 591 | if (isset($associationOverrideElement['joinTable'])) { |
592 | 592 | |
593 | 593 | $joinTableElement = $associationOverrideElement['joinTable']; |
594 | - $joinTable = [ |
|
594 | + $joinTable = [ |
|
595 | 595 | 'name' => $joinTableElement['name'] |
596 | 596 | ]; |
597 | 597 | |
@@ -625,7 +625,7 @@ discard block |
||
625 | 625 | |
626 | 626 | // Check for `fetch` |
627 | 627 | if (isset($associationOverrideElement['fetch'])) { |
628 | - $override['fetch'] = constant(Metadata::class . '::FETCH_' . $associationOverrideElement['fetch']); |
|
628 | + $override['fetch'] = constant(Metadata::class.'::FETCH_'.$associationOverrideElement['fetch']); |
|
629 | 629 | } |
630 | 630 | |
631 | 631 | $metadata->setAssociationOverride($fieldName, $override); |
@@ -645,7 +645,7 @@ discard block |
||
645 | 645 | if (isset($element['lifecycleCallbacks'])) { |
646 | 646 | foreach ($element['lifecycleCallbacks'] as $type => $methods) { |
647 | 647 | foreach ($methods as $method) { |
648 | - $metadata->addLifecycleCallback($method, constant('Doctrine\ORM\Events::' . $type)); |
|
648 | + $metadata->addLifecycleCallback($method, constant('Doctrine\ORM\Events::'.$type)); |
|
649 | 649 | } |
650 | 650 | } |
651 | 651 | } |
@@ -787,12 +787,12 @@ discard block |
||
787 | 787 | $region = isset($cacheMapping['region']) ? (string) $cacheMapping['region'] : null; |
788 | 788 | $usage = isset($cacheMapping['usage']) ? strtoupper($cacheMapping['usage']) : null; |
789 | 789 | |
790 | - if ($usage && ! defined('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_' . $usage)) { |
|
790 | + if ($usage && ! defined('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_'.$usage)) { |
|
791 | 791 | throw new \InvalidArgumentException(sprintf('Invalid cache usage "%s"', $usage)); |
792 | 792 | } |
793 | 793 | |
794 | 794 | if ($usage) { |
795 | - $usage = constant('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_' . $usage); |
|
795 | + $usage = constant('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_'.$usage); |
|
796 | 796 | } |
797 | 797 | |
798 | 798 | return [ |
@@ -806,7 +806,7 @@ discard block |
||
806 | 806 | */ |
807 | 807 | protected function loadMappingFile($file) |
808 | 808 | { |
809 | - if (defined(Yaml::class . '::PARSE_KEYS_AS_STRINGS')) { |
|
809 | + if (defined(Yaml::class.'::PARSE_KEYS_AS_STRINGS')) { |
|
810 | 810 | return Yaml::parse(file_get_contents($file), Yaml::PARSE_KEYS_AS_STRINGS); |
811 | 811 | } |
812 | 812 |
@@ -117,6 +117,7 @@ discard block |
||
117 | 117 | } |
118 | 118 | |
119 | 119 | /** |
120 | + * @param string|false $columnPrefix |
|
120 | 121 | * @return ClassMetadataInfo |
121 | 122 | */ |
122 | 123 | private function generateIsbnEmbeddableFixture(array $embeddedClasses = [], $columnPrefix = null) |
@@ -1167,7 +1168,7 @@ discard block |
||
1167 | 1168 | |
1168 | 1169 | /** |
1169 | 1170 | * @param string $type |
1170 | - * @param \ReflectionProperty $method |
|
1171 | + * @param \ReflectionMethod $method |
|
1171 | 1172 | */ |
1172 | 1173 | private function assertPhpDocParamType($type, \ReflectionMethod $method) |
1173 | 1174 | { |
@@ -539,7 +539,7 @@ discard block |
||
539 | 539 | $this->_generator->writeEntityClass($metadata, $this->_tmpDir); |
540 | 540 | |
541 | 541 | $filename = $this->_tmpDir . DIRECTORY_SEPARATOR |
542 | - . $this->_namespace . DIRECTORY_SEPARATOR . 'DDC1784Entity.php'; |
|
542 | + . $this->_namespace . DIRECTORY_SEPARATOR . 'DDC1784Entity.php'; |
|
543 | 543 | |
544 | 544 | $this->assertFileExists($filename); |
545 | 545 | require_once $filename; |
@@ -600,9 +600,9 @@ discard block |
||
600 | 600 | |
601 | 601 | } |
602 | 602 | |
603 | - /** |
|
604 | - * @group DDC-2172 |
|
605 | - */ |
|
603 | + /** |
|
604 | + * @group DDC-2172 |
|
605 | + */ |
|
606 | 606 | public function testGetInheritanceTypeString() |
607 | 607 | { |
608 | 608 | $reflection = new \ReflectionClass('\Doctrine\ORM\Mapping\ClassMetadataInfo'); |
@@ -630,8 +630,8 @@ discard block |
||
630 | 630 | } |
631 | 631 | |
632 | 632 | /** |
633 | - * @group DDC-2172 |
|
634 | - */ |
|
633 | + * @group DDC-2172 |
|
634 | + */ |
|
635 | 635 | public function testGetChangeTrackingPolicyString() |
636 | 636 | { |
637 | 637 | $reflection = new \ReflectionClass('\Doctrine\ORM\Mapping\ClassMetadata'); |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | { |
28 | 28 | $this->_namespace = uniqid("doctrine_"); |
29 | 29 | $this->_tmpDir = \sys_get_temp_dir(); |
30 | - \mkdir($this->_tmpDir . \DIRECTORY_SEPARATOR . $this->_namespace); |
|
30 | + \mkdir($this->_tmpDir.\DIRECTORY_SEPARATOR.$this->_namespace); |
|
31 | 31 | $this->_generator = new EntityGenerator(); |
32 | 32 | $this->_generator->setAnnotationPrefix(""); |
33 | 33 | $this->_generator->setGenerateAnnotations(true); |
@@ -39,14 +39,14 @@ discard block |
||
39 | 39 | |
40 | 40 | public function tearDown() |
41 | 41 | { |
42 | - $ri = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($this->_tmpDir . '/' . $this->_namespace)); |
|
42 | + $ri = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($this->_tmpDir.'/'.$this->_namespace)); |
|
43 | 43 | foreach ($ri AS $file) { |
44 | 44 | /* @var $file \SplFileInfo */ |
45 | 45 | if ($file->isFile()) { |
46 | 46 | \unlink($file->getPathname()); |
47 | 47 | } |
48 | 48 | } |
49 | - rmdir($this->_tmpDir . '/' . $this->_namespace); |
|
49 | + rmdir($this->_tmpDir.'/'.$this->_namespace); |
|
50 | 50 | } |
51 | 51 | |
52 | 52 | /** |
@@ -56,9 +56,9 @@ discard block |
||
56 | 56 | */ |
57 | 57 | public function generateBookEntityFixture(array $embeddedClasses = []) |
58 | 58 | { |
59 | - $metadata = new ClassMetadataInfo($this->_namespace . '\EntityGeneratorBook'); |
|
59 | + $metadata = new ClassMetadataInfo($this->_namespace.'\EntityGeneratorBook'); |
|
60 | 60 | $metadata->namespace = $this->_namespace; |
61 | - $metadata->customRepositoryClassName = $this->_namespace . '\EntityGeneratorBookRepository'; |
|
61 | + $metadata->customRepositoryClassName = $this->_namespace.'\EntityGeneratorBookRepository'; |
|
62 | 62 | |
63 | 63 | $metadata->table['name'] = 'book'; |
64 | 64 | $metadata->table['uniqueConstraints']['name_uniq'] = ['columns' => ['name']]; |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | |
101 | 101 | private function generateEntityTypeFixture(array $field) |
102 | 102 | { |
103 | - $metadata = new ClassMetadataInfo($this->_namespace . '\EntityType'); |
|
103 | + $metadata = new ClassMetadataInfo($this->_namespace.'\EntityType'); |
|
104 | 104 | $metadata->namespace = $this->_namespace; |
105 | 105 | |
106 | 106 | $metadata->table['name'] = 'entity_type'; |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | */ |
122 | 122 | private function generateIsbnEmbeddableFixture(array $embeddedClasses = [], $columnPrefix = null) |
123 | 123 | { |
124 | - $metadata = new ClassMetadataInfo($this->_namespace . '\EntityGeneratorIsbn'); |
|
124 | + $metadata = new ClassMetadataInfo($this->_namespace.'\EntityGeneratorIsbn'); |
|
125 | 125 | $metadata->namespace = $this->_namespace; |
126 | 126 | $metadata->isEmbeddedClass = true; |
127 | 127 | $metadata->mapField(['fieldName' => 'prefix', 'type' => 'integer']); |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | */ |
145 | 145 | private function generateTestEmbeddableFixture() |
146 | 146 | { |
147 | - $metadata = new ClassMetadataInfo($this->_namespace . '\EntityGeneratorTestEmbeddable'); |
|
147 | + $metadata = new ClassMetadataInfo($this->_namespace.'\EntityGeneratorTestEmbeddable'); |
|
148 | 148 | $metadata->namespace = $this->_namespace; |
149 | 149 | $metadata->isEmbeddedClass = true; |
150 | 150 | $metadata->mapField(['fieldName' => 'field1', 'type' => 'integer']); |
@@ -187,11 +187,11 @@ discard block |
||
187 | 187 | foreach ($embeddableMetadata->embeddedClasses as $property => $embeddableClass) { |
188 | 188 | $classMetadata->mapEmbedded( |
189 | 189 | [ |
190 | - 'fieldName' => $fieldName . '.' . $property, |
|
190 | + 'fieldName' => $fieldName.'.'.$property, |
|
191 | 191 | 'class' => $embeddableClass['class'], |
192 | 192 | 'columnPrefix' => $embeddableClass['columnPrefix'], |
193 | 193 | 'declaredField' => $embeddableClass['declaredField'] |
194 | - ? $fieldName . '.' . $embeddableClass['declaredField'] |
|
194 | + ? $fieldName.'.'.$embeddableClass['declaredField'] |
|
195 | 195 | : $fieldName, |
196 | 196 | 'originalField' => $embeddableClass['originalField'] ?: $property, |
197 | 197 | ] |
@@ -205,7 +205,7 @@ discard block |
||
205 | 205 | private function loadEntityClass(ClassMetadataInfo $metadata) |
206 | 206 | { |
207 | 207 | $className = basename(str_replace('\\', '/', $metadata->name)); |
208 | - $path = $this->_tmpDir . '/' . $this->_namespace . '/' . $className . '.php'; |
|
208 | + $path = $this->_tmpDir.'/'.$this->_namespace.'/'.$className.'.php'; |
|
209 | 209 | |
210 | 210 | $this->assertFileExists($path); |
211 | 211 | |
@@ -265,19 +265,19 @@ discard block |
||
265 | 265 | |
266 | 266 | $book = $this->newInstance($metadata); |
267 | 267 | $this->assertTrue(class_exists($metadata->name), "Class does not exist."); |
268 | - $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', '__construct'), "EntityGeneratorBook::__construct() missing."); |
|
269 | - $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'getId'), "EntityGeneratorBook::getId() missing."); |
|
270 | - $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'setName'), "EntityGeneratorBook::setName() missing."); |
|
271 | - $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'getName'), "EntityGeneratorBook::getName() missing."); |
|
272 | - $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'setStatus'), "EntityGeneratorBook::setStatus() missing."); |
|
273 | - $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'getStatus'), "EntityGeneratorBook::getStatus() missing."); |
|
274 | - $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'setAuthor'), "EntityGeneratorBook::setAuthor() missing."); |
|
275 | - $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'getAuthor'), "EntityGeneratorBook::getAuthor() missing."); |
|
276 | - $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'getComments'), "EntityGeneratorBook::getComments() missing."); |
|
277 | - $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'addComment'), "EntityGeneratorBook::addComment() missing."); |
|
278 | - $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'removeComment'), "EntityGeneratorBook::removeComment() missing."); |
|
279 | - $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'setIsbn'), "EntityGeneratorBook::setIsbn() missing."); |
|
280 | - $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'getIsbn'), "EntityGeneratorBook::getIsbn() missing."); |
|
268 | + $this->assertTrue(method_exists($metadata->namespace.'\EntityGeneratorBook', '__construct'), "EntityGeneratorBook::__construct() missing."); |
|
269 | + $this->assertTrue(method_exists($metadata->namespace.'\EntityGeneratorBook', 'getId'), "EntityGeneratorBook::getId() missing."); |
|
270 | + $this->assertTrue(method_exists($metadata->namespace.'\EntityGeneratorBook', 'setName'), "EntityGeneratorBook::setName() missing."); |
|
271 | + $this->assertTrue(method_exists($metadata->namespace.'\EntityGeneratorBook', 'getName'), "EntityGeneratorBook::getName() missing."); |
|
272 | + $this->assertTrue(method_exists($metadata->namespace.'\EntityGeneratorBook', 'setStatus'), "EntityGeneratorBook::setStatus() missing."); |
|
273 | + $this->assertTrue(method_exists($metadata->namespace.'\EntityGeneratorBook', 'getStatus'), "EntityGeneratorBook::getStatus() missing."); |
|
274 | + $this->assertTrue(method_exists($metadata->namespace.'\EntityGeneratorBook', 'setAuthor'), "EntityGeneratorBook::setAuthor() missing."); |
|
275 | + $this->assertTrue(method_exists($metadata->namespace.'\EntityGeneratorBook', 'getAuthor'), "EntityGeneratorBook::getAuthor() missing."); |
|
276 | + $this->assertTrue(method_exists($metadata->namespace.'\EntityGeneratorBook', 'getComments'), "EntityGeneratorBook::getComments() missing."); |
|
277 | + $this->assertTrue(method_exists($metadata->namespace.'\EntityGeneratorBook', 'addComment'), "EntityGeneratorBook::addComment() missing."); |
|
278 | + $this->assertTrue(method_exists($metadata->namespace.'\EntityGeneratorBook', 'removeComment'), "EntityGeneratorBook::removeComment() missing."); |
|
279 | + $this->assertTrue(method_exists($metadata->namespace.'\EntityGeneratorBook', 'setIsbn'), "EntityGeneratorBook::setIsbn() missing."); |
|
280 | + $this->assertTrue(method_exists($metadata->namespace.'\EntityGeneratorBook', 'getIsbn'), "EntityGeneratorBook::getIsbn() missing."); |
|
281 | 281 | |
282 | 282 | $reflClass = new \ReflectionClass($metadata->name); |
283 | 283 | |
@@ -330,7 +330,7 @@ discard block |
||
330 | 330 | |
331 | 331 | $this->_generator->writeEntityClass($metadata, $this->_tmpDir); |
332 | 332 | |
333 | - $this->assertFileExists($this->_tmpDir . "/" . $this->_namespace . "/EntityGeneratorBook.php~"); |
|
333 | + $this->assertFileExists($this->_tmpDir."/".$this->_namespace."/EntityGeneratorBook.php~"); |
|
334 | 334 | |
335 | 335 | $book = $this->newInstance($metadata); |
336 | 336 | $reflClass = new \ReflectionClass($metadata->name); |
@@ -375,7 +375,7 @@ discard block |
||
375 | 375 | // Should not throw a PHP fatal error |
376 | 376 | $this->_generator->writeEntityClass($metadata, $this->_tmpDir); |
377 | 377 | |
378 | - $this->assertFileExists($this->_tmpDir . "/" . $this->_namespace . "/EntityGeneratorBook.php~"); |
|
378 | + $this->assertFileExists($this->_tmpDir."/".$this->_namespace."/EntityGeneratorBook.php~"); |
|
379 | 379 | |
380 | 380 | $this->newInstance($metadata); |
381 | 381 | $reflClass = new \ReflectionClass($metadata->name); |
@@ -410,7 +410,7 @@ discard block |
||
410 | 410 | $this->assertPhpDocReturnType('\Doctrine\Tests\ORM\Tools\EntityGeneratorAuthor|null', new \ReflectionMethod($book, 'getAuthor')); |
411 | 411 | $this->assertPhpDocParamType('\Doctrine\Tests\ORM\Tools\EntityGeneratorAuthor|null', new \ReflectionMethod($book, 'setAuthor')); |
412 | 412 | |
413 | - $expectedClassName = '\\' . $embeddedMetadata->name; |
|
413 | + $expectedClassName = '\\'.$embeddedMetadata->name; |
|
414 | 414 | $this->assertPhpDocVarType($expectedClassName, new \ReflectionProperty($book, 'isbn')); |
415 | 415 | $this->assertPhpDocReturnType($expectedClassName, new \ReflectionMethod($book, 'getIsbn')); |
416 | 416 | $this->assertPhpDocParamType($expectedClassName, new \ReflectionMethod($book, 'setIsbn')); |
@@ -520,7 +520,7 @@ discard block |
||
520 | 520 | */ |
521 | 521 | public function testMappedSuperclassAnnotationGeneration() |
522 | 522 | { |
523 | - $metadata = new ClassMetadataInfo($this->_namespace . '\EntityGeneratorBook'); |
|
523 | + $metadata = new ClassMetadataInfo($this->_namespace.'\EntityGeneratorBook'); |
|
524 | 524 | $metadata->namespace = $this->_namespace; |
525 | 525 | $metadata->isMappedSuperclass = true; |
526 | 526 | |
@@ -558,7 +558,7 @@ discard block |
||
558 | 558 | */ |
559 | 559 | public function testGenerateEntityWithSequenceGenerator() |
560 | 560 | { |
561 | - $metadata = new ClassMetadataInfo($this->_namespace . '\DDC1784Entity'); |
|
561 | + $metadata = new ClassMetadataInfo($this->_namespace.'\DDC1784Entity'); |
|
562 | 562 | $metadata->namespace = $this->_namespace; |
563 | 563 | $metadata->mapField(['fieldName' => 'id', 'type' => 'integer', 'id' => true]); |
564 | 564 | $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_SEQUENCE); |
@@ -571,8 +571,8 @@ discard block |
||
571 | 571 | ); |
572 | 572 | $this->_generator->writeEntityClass($metadata, $this->_tmpDir); |
573 | 573 | |
574 | - $filename = $this->_tmpDir . DIRECTORY_SEPARATOR |
|
575 | - . $this->_namespace . DIRECTORY_SEPARATOR . 'DDC1784Entity.php'; |
|
574 | + $filename = $this->_tmpDir.DIRECTORY_SEPARATOR |
|
575 | + . $this->_namespace.DIRECTORY_SEPARATOR.'DDC1784Entity.php'; |
|
576 | 576 | |
577 | 577 | $this->assertFileExists($filename); |
578 | 578 | require_once $filename; |
@@ -592,7 +592,7 @@ discard block |
||
592 | 592 | */ |
593 | 593 | public function testGenerateEntityWithMultipleInverseJoinColumns() |
594 | 594 | { |
595 | - $metadata = new ClassMetadataInfo($this->_namespace . '\DDC2079Entity'); |
|
595 | + $metadata = new ClassMetadataInfo($this->_namespace.'\DDC2079Entity'); |
|
596 | 596 | $metadata->namespace = $this->_namespace; |
597 | 597 | $metadata->mapField(['fieldName' => 'id', 'type' => 'integer', 'id' => true]); |
598 | 598 | $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_SEQUENCE); |
@@ -603,20 +603,20 @@ discard block |
||
603 | 603 | 'joinTable' => [ |
604 | 604 | 'name' => 'unidade_centro_custo', |
605 | 605 | 'joinColumns' => [ |
606 | - ['name' => 'idorcamento', 'referencedColumnName' => 'idorcamento'], |
|
607 | - ['name' => 'idunidade', 'referencedColumnName' => 'idunidade'] |
|
606 | + ['name' => 'idorcamento', 'referencedColumnName' => 'idorcamento'], |
|
607 | + ['name' => 'idunidade', 'referencedColumnName' => 'idunidade'] |
|
608 | 608 | ], |
609 | 609 | 'inverseJoinColumns' => [ |
610 | - ['name' => 'idcentrocusto', 'referencedColumnName' => 'idcentrocusto'], |
|
611 | - ['name' => 'idpais', 'referencedColumnName' => 'idpais'], |
|
610 | + ['name' => 'idcentrocusto', 'referencedColumnName' => 'idcentrocusto'], |
|
611 | + ['name' => 'idpais', 'referencedColumnName' => 'idpais'], |
|
612 | 612 | ], |
613 | 613 | ], |
614 | 614 | ] |
615 | 615 | ); |
616 | 616 | $this->_generator->writeEntityClass($metadata, $this->_tmpDir); |
617 | 617 | |
618 | - $filename = $this->_tmpDir . DIRECTORY_SEPARATOR |
|
619 | - . $this->_namespace . DIRECTORY_SEPARATOR . 'DDC2079Entity.php'; |
|
618 | + $filename = $this->_tmpDir.DIRECTORY_SEPARATOR |
|
619 | + . $this->_namespace.DIRECTORY_SEPARATOR.'DDC2079Entity.php'; |
|
620 | 620 | |
621 | 621 | $this->assertFileExists($filename); |
622 | 622 | require_once $filename; |
@@ -646,7 +646,7 @@ discard block |
||
646 | 646 | $method->setAccessible(true); |
647 | 647 | |
648 | 648 | foreach ($constants as $name => $value) { |
649 | - if( ! preg_match($pattern, $name)) { |
|
649 | + if ( ! preg_match($pattern, $name)) { |
|
650 | 650 | continue; |
651 | 651 | } |
652 | 652 | |
@@ -675,7 +675,7 @@ discard block |
||
675 | 675 | $method->setAccessible(true); |
676 | 676 | |
677 | 677 | foreach ($constants as $name => $value) { |
678 | - if( ! preg_match($pattern, $name)) { |
|
678 | + if ( ! preg_match($pattern, $name)) { |
|
679 | 679 | continue; |
680 | 680 | } |
681 | 681 | |
@@ -704,7 +704,7 @@ discard block |
||
704 | 704 | $method->setAccessible(true); |
705 | 705 | |
706 | 706 | foreach ($constants as $name => $value) { |
707 | - if( ! preg_match($pattern, $name)) { |
|
707 | + if ( ! preg_match($pattern, $name)) { |
|
708 | 708 | continue; |
709 | 709 | } |
710 | 710 | |
@@ -728,7 +728,7 @@ discard block |
||
728 | 728 | public function testEntityTypeAlias(array $field) |
729 | 729 | { |
730 | 730 | $metadata = $this->generateEntityTypeFixture($field); |
731 | - $path = $this->_tmpDir . '/'. $this->_namespace . '/EntityType.php'; |
|
731 | + $path = $this->_tmpDir.'/'.$this->_namespace.'/EntityType.php'; |
|
732 | 732 | |
733 | 733 | $this->assertFileExists($path); |
734 | 734 | require_once $path; |
@@ -739,8 +739,8 @@ discard block |
||
739 | 739 | $type = $field['phpType']; |
740 | 740 | $name = $field['fieldName']; |
741 | 741 | $value = $field['value']; |
742 | - $getter = "get" . ucfirst($name); |
|
743 | - $setter = "set" . ucfirst($name); |
|
742 | + $getter = "get".ucfirst($name); |
|
743 | + $setter = "set".ucfirst($name); |
|
744 | 744 | |
745 | 745 | $this->assertPhpDocVarType($type, $reflClass->getProperty($name)); |
746 | 746 | $this->assertPhpDocParamType($type, $reflClass->getMethod($setter)); |
@@ -761,13 +761,13 @@ discard block |
||
761 | 761 | |
762 | 762 | $user = new DDC2372User(); |
763 | 763 | $metadata = $cmf->getMetadataFor(get_class($user)); |
764 | - $metadata->name = $this->_namespace . "\DDC2372User"; |
|
764 | + $metadata->name = $this->_namespace."\DDC2372User"; |
|
765 | 765 | $metadata->namespace = $this->_namespace; |
766 | 766 | |
767 | 767 | $this->_generator->writeEntityClass($metadata, $this->_tmpDir); |
768 | 768 | |
769 | - $this->assertFileExists($this->_tmpDir . "/" . $this->_namespace . "/DDC2372User.php"); |
|
770 | - require $this->_tmpDir . "/" . $this->_namespace . "/DDC2372User.php"; |
|
769 | + $this->assertFileExists($this->_tmpDir."/".$this->_namespace."/DDC2372User.php"); |
|
770 | + require $this->_tmpDir."/".$this->_namespace."/DDC2372User.php"; |
|
771 | 771 | |
772 | 772 | $reflClass = new \ReflectionClass($metadata->name); |
773 | 773 | |
@@ -787,13 +787,13 @@ discard block |
||
787 | 787 | |
788 | 788 | $user = new DDC2372Admin(); |
789 | 789 | $metadata = $cmf->getMetadataFor(get_class($user)); |
790 | - $metadata->name = $this->_namespace . "\DDC2372Admin"; |
|
790 | + $metadata->name = $this->_namespace."\DDC2372Admin"; |
|
791 | 791 | $metadata->namespace = $this->_namespace; |
792 | 792 | |
793 | 793 | $this->_generator->writeEntityClass($metadata, $this->_tmpDir); |
794 | 794 | |
795 | - $this->assertFileExists($this->_tmpDir . "/" . $this->_namespace . "/DDC2372Admin.php"); |
|
796 | - require $this->_tmpDir . "/" . $this->_namespace . "/DDC2372Admin.php"; |
|
795 | + $this->assertFileExists($this->_tmpDir."/".$this->_namespace."/DDC2372Admin.php"); |
|
796 | + require $this->_tmpDir."/".$this->_namespace."/DDC2372Admin.php"; |
|
797 | 797 | |
798 | 798 | $reflClass = new \ReflectionClass($metadata->name); |
799 | 799 | |
@@ -813,20 +813,20 @@ discard block |
||
813 | 813 | $cmf->setEntityManager($em); |
814 | 814 | |
815 | 815 | $ns = $this->_namespace; |
816 | - $nsdir = $this->_tmpDir . '/' . $ns; |
|
816 | + $nsdir = $this->_tmpDir.'/'.$ns; |
|
817 | 817 | |
818 | 818 | $content = str_replace( |
819 | 819 | 'namespace Doctrine\Tests\Models\DDC1590', |
820 | - 'namespace ' . $ns, |
|
821 | - file_get_contents(__DIR__ . '/../../Models/DDC1590/DDC1590User.php') |
|
820 | + 'namespace '.$ns, |
|
821 | + file_get_contents(__DIR__.'/../../Models/DDC1590/DDC1590User.php') |
|
822 | 822 | ); |
823 | 823 | |
824 | - $fname = $nsdir . "/DDC1590User.php"; |
|
824 | + $fname = $nsdir."/DDC1590User.php"; |
|
825 | 825 | file_put_contents($fname, $content); |
826 | 826 | require $fname; |
827 | 827 | |
828 | 828 | |
829 | - $metadata = $cmf->getMetadataFor($ns . '\DDC1590User'); |
|
829 | + $metadata = $cmf->getMetadataFor($ns.'\DDC1590User'); |
|
830 | 830 | $this->_generator->writeEntityClass($metadata, $this->_tmpDir); |
831 | 831 | |
832 | 832 | // class DDC1590User extends DDC1590Entity { ... } |
@@ -834,13 +834,13 @@ discard block |
||
834 | 834 | |
835 | 835 | // class _DDC1590User extends DDC1590Entity { ... } |
836 | 836 | $source2 = str_replace('class DDC1590User', 'class _DDC1590User', $source); |
837 | - $fname2 = $nsdir . "/_DDC1590User.php"; |
|
837 | + $fname2 = $nsdir."/_DDC1590User.php"; |
|
838 | 838 | file_put_contents($fname2, $source2); |
839 | 839 | require $fname2; |
840 | 840 | |
841 | 841 | // class __DDC1590User { ... } |
842 | 842 | $source3 = str_replace('class DDC1590User extends DDC1590Entity', 'class __DDC1590User', $source); |
843 | - $fname3 = $nsdir . "/__DDC1590User.php"; |
|
843 | + $fname3 = $nsdir."/__DDC1590User.php"; |
|
844 | 844 | file_put_contents($fname3, $source3); |
845 | 845 | require $fname3; |
846 | 846 | |
@@ -994,7 +994,7 @@ discard block |
||
994 | 994 | $this->loadEntityClass($metadata); |
995 | 995 | |
996 | 996 | $className = basename(str_replace('\\', '/', $metadata->name)); |
997 | - $path = $this->_tmpDir . '/' . $this->_namespace . '/' . $className . '.php'; |
|
997 | + $path = $this->_tmpDir.'/'.$this->_namespace.'/'.$className.'.php'; |
|
998 | 998 | $classTest = file_get_contents($path); |
999 | 999 | |
1000 | 1000 | $this->_generator->setRegenerateEntityIfExists(true); |
@@ -1003,7 +1003,7 @@ discard block |
||
1003 | 1003 | $this->_generator->writeEntityClass($metadata, $this->_tmpDir); |
1004 | 1004 | $classNew = file_get_contents($path); |
1005 | 1005 | |
1006 | - $this->assertSame($classTest,$classNew); |
|
1006 | + $this->assertSame($classTest, $classNew); |
|
1007 | 1007 | } |
1008 | 1008 | |
1009 | 1009 | /** |
@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use Doctrine\Common\Cache\ArrayCache; |
6 | 6 | use Doctrine\DBAL\Driver\Connection; |
7 | -use Doctrine\DBAL\Driver\PDOSqlite\Driver as SqliteDriver; |
|
8 | 7 | use Doctrine\DBAL\Logging\DebugStack; |
9 | 8 | use Doctrine\DBAL\Types\Type; |
10 | 9 | use Doctrine\ORM\Cache\CacheConfiguration; |
@@ -399,7 +399,7 @@ discard block |
||
399 | 399 | $conn->executeUpdate('DELETE FROM RoutingLocation'); |
400 | 400 | } |
401 | 401 | |
402 | - if(isset($this->_usedModelSets['navigation'])) { |
|
402 | + if (isset($this->_usedModelSets['navigation'])) { |
|
403 | 403 | $conn->executeUpdate('DELETE FROM navigation_tour_pois'); |
404 | 404 | $conn->executeUpdate('DELETE FROM navigation_photos'); |
405 | 405 | $conn->executeUpdate('DELETE FROM navigation_pois'); |
@@ -407,7 +407,7 @@ discard block |
||
407 | 407 | $conn->executeUpdate('DELETE FROM navigation_countries'); |
408 | 408 | } |
409 | 409 | if (isset($this->_usedModelSets['directorytree'])) { |
410 | - $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier("file")); |
|
410 | + $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier("file")); |
|
411 | 411 | // MySQL doesn't know deferred deletions therefore only executing the second query gives errors. |
412 | 412 | $conn->executeUpdate('DELETE FROM Directory WHERE parentDirectory_id IS NOT NULL'); |
413 | 413 | $conn->executeUpdate('DELETE FROM Directory'); |
@@ -497,12 +497,12 @@ discard block |
||
497 | 497 | ) |
498 | 498 | ); |
499 | 499 | |
500 | - $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-users-groups')); |
|
501 | - $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-group')); |
|
502 | - $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-phone')); |
|
503 | - $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-user')); |
|
504 | - $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-address')); |
|
505 | - $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-city')); |
|
500 | + $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('quote-users-groups')); |
|
501 | + $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('quote-group')); |
|
502 | + $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('quote-phone')); |
|
503 | + $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('quote-user')); |
|
504 | + $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('quote-address')); |
|
505 | + $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('quote-city')); |
|
506 | 506 | } |
507 | 507 | |
508 | 508 | if (isset($this->_usedModelSets['vct_onetoone'])) { |
@@ -641,9 +641,9 @@ discard block |
||
641 | 641 | |
642 | 642 | if (isset($GLOBALS['DOCTRINE_MARK_SQL_LOGS'])) { |
643 | 643 | if (in_array(static::$_sharedConn->getDatabasePlatform()->getName(), ["mysql", "postgresql"])) { |
644 | - static::$_sharedConn->executeQuery('SELECT 1 /*' . get_class($this) . '*/'); |
|
644 | + static::$_sharedConn->executeQuery('SELECT 1 /*'.get_class($this).'*/'); |
|
645 | 645 | } else if (static::$_sharedConn->getDatabasePlatform()->getName() == "oracle") { |
646 | - static::$_sharedConn->executeQuery('SELECT 1 /*' . get_class($this) . '*/ FROM dual'); |
|
646 | + static::$_sharedConn->executeQuery('SELECT 1 /*'.get_class($this).'*/ FROM dual'); |
|
647 | 647 | } |
648 | 648 | } |
649 | 649 | |
@@ -702,7 +702,7 @@ discard block |
||
702 | 702 | $config = new Configuration(); |
703 | 703 | $config->setMetadataCacheImpl(self::$_metadataCacheImpl); |
704 | 704 | $config->setQueryCacheImpl(self::$_queryCacheImpl); |
705 | - $config->setProxyDir(__DIR__ . '/Proxies'); |
|
705 | + $config->setProxyDir(__DIR__.'/Proxies'); |
|
706 | 706 | $config->setProxyNamespace('Doctrine\Tests\Proxies'); |
707 | 707 | |
708 | 708 | if (null !== $this->resultCacheImpl) { |
@@ -734,8 +734,8 @@ discard block |
||
734 | 734 | $config->setMetadataDriverImpl( |
735 | 735 | $config->newDefaultAnnotationDriver( |
736 | 736 | [ |
737 | - realpath(__DIR__ . '/Models/Cache'), |
|
738 | - realpath(__DIR__ . '/Models/GeoNames') |
|
737 | + realpath(__DIR__.'/Models/Cache'), |
|
738 | + realpath(__DIR__.'/Models/GeoNames') |
|
739 | 739 | ], |
740 | 740 | true |
741 | 741 | ) |
@@ -783,7 +783,7 @@ discard block |
||
783 | 783 | throw $e; |
784 | 784 | } |
785 | 785 | |
786 | - if(isset($this->_sqlLoggerStack->queries) && count($this->_sqlLoggerStack->queries)) { |
|
786 | + if (isset($this->_sqlLoggerStack->queries) && count($this->_sqlLoggerStack->queries)) { |
|
787 | 787 | $queries = ""; |
788 | 788 | $last25queries = array_slice(array_reverse($this->_sqlLoggerStack->queries, true), 0, 25, true); |
789 | 789 | foreach ($last25queries as $i => $query) { |
@@ -794,9 +794,9 @@ discard block |
||
794 | 794 | |
795 | 795 | $trace = $e->getTrace(); |
796 | 796 | $traceMsg = ""; |
797 | - foreach($trace AS $part) { |
|
798 | - if(isset($part['file'])) { |
|
799 | - if(strpos($part['file'], "PHPUnit/") !== false) { |
|
797 | + foreach ($trace AS $part) { |
|
798 | + if (isset($part['file'])) { |
|
799 | + if (strpos($part['file'], "PHPUnit/") !== false) { |
|
800 | 800 | // Beginning with PHPUnit files we don't print the trace anymore. |
801 | 801 | break; |
802 | 802 | } |
@@ -807,7 +807,7 @@ discard block |
||
807 | 807 | |
808 | 808 | $message = "[".get_class($e)."] ".$e->getMessage().PHP_EOL.PHP_EOL."With queries:".PHP_EOL.$queries.PHP_EOL."Trace:".PHP_EOL.$traceMsg; |
809 | 809 | |
810 | - throw new \Exception($message, (int)$e->getCode(), $e); |
|
810 | + throw new \Exception($message, (int) $e->getCode(), $e); |
|
811 | 811 | } |
812 | 812 | throw $e; |
813 | 813 | } |
@@ -787,7 +787,12 @@ |
||
787 | 787 | $queries = ""; |
788 | 788 | $last25queries = array_slice(array_reverse($this->_sqlLoggerStack->queries, true), 0, 25, true); |
789 | 789 | foreach ($last25queries as $i => $query) { |
790 | - $params = array_map(function($p) { if (is_object($p)) return get_class($p); else return var_export($p, true); }, $query['params'] ?: [] |
|
790 | + $params = array_map(function($p) { if (is_object($p)) { |
|
791 | + return get_class($p); |
|
792 | + } else { |
|
793 | + return var_export($p, true); |
|
794 | + } |
|
795 | + }, $query['params'] ?: [] |
|
791 | 796 | ); |
792 | 797 | $queries .= $i.". SQL: '".$query['sql']."' Params: ".implode(", ", $params).PHP_EOL; |
793 | 798 | } |
@@ -25,13 +25,13 @@ |
||
25 | 25 | $classLoader = new \Doctrine\Common\ClassLoader('Symfony'); |
26 | 26 | $classLoader->register(); |
27 | 27 | |
28 | -$configFile = getcwd() . DIRECTORY_SEPARATOR . 'cli-config.php'; |
|
28 | +$configFile = getcwd().DIRECTORY_SEPARATOR.'cli-config.php'; |
|
29 | 29 | |
30 | 30 | $helperSet = null; |
31 | 31 | if (file_exists($configFile)) { |
32 | 32 | if ( ! is_readable($configFile)) { |
33 | 33 | trigger_error( |
34 | - 'Configuration file [' . $configFile . '] does not have read permission.', E_USER_ERROR |
|
34 | + 'Configuration file ['.$configFile.'] does not have read permission.', E_USER_ERROR |
|
35 | 35 | ); |
36 | 36 | } |
37 | 37 |
@@ -21,8 +21,8 @@ discard block |
||
21 | 21 | use Doctrine\ORM\Tools\Console\ConsoleRunner; |
22 | 22 | |
23 | 23 | $autoloadFiles = [ |
24 | - __DIR__ . '/../vendor/autoload.php', |
|
25 | - __DIR__ . '/../../../autoload.php' |
|
24 | + __DIR__.'/../vendor/autoload.php', |
|
25 | + __DIR__.'/../../../autoload.php' |
|
26 | 26 | ]; |
27 | 27 | |
28 | 28 | foreach ($autoloadFiles as $autoloadFile) { |
@@ -32,11 +32,11 @@ discard block |
||
32 | 32 | } |
33 | 33 | } |
34 | 34 | |
35 | -$directories = [getcwd(), getcwd() . DIRECTORY_SEPARATOR . 'config']; |
|
35 | +$directories = [getcwd(), getcwd().DIRECTORY_SEPARATOR.'config']; |
|
36 | 36 | |
37 | 37 | $configFile = null; |
38 | 38 | foreach ($directories as $directory) { |
39 | - $configFile = $directory . DIRECTORY_SEPARATOR . 'cli-config.php'; |
|
39 | + $configFile = $directory.DIRECTORY_SEPARATOR.'cli-config.php'; |
|
40 | 40 | |
41 | 41 | if (file_exists($configFile)) { |
42 | 42 | break; |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | } |
50 | 50 | |
51 | 51 | if ( ! is_readable($configFile)) { |
52 | - echo 'Configuration file [' . $configFile . '] does not have read permission.' . "\n"; |
|
52 | + echo 'Configuration file ['.$configFile.'] does not have read permission.'."\n"; |
|
53 | 53 | exit(1); |
54 | 54 | } |
55 | 55 |