@@ -40,12 +40,12 @@ |
||
40 | 40 | $ids = []; |
41 | 41 | |
42 | 42 | foreach ($id as $key => $value) { |
43 | - $ids[] = $key . '(' . $value . ')'; |
|
43 | + $ids[] = $key.'('.$value.')'; |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | |
47 | 47 | return new self( |
48 | - 'Entity of type \'' . $className . '\'' . ($ids ? ' for IDs ' . implode(', ', $ids) : '') . ' was not found' |
|
48 | + 'Entity of type \''.$className.'\''.($ids ? ' for IDs '.implode(', ', $ids) : '').' was not found' |
|
49 | 49 | ); |
50 | 50 | } |
51 | 51 | } |
@@ -108,10 +108,10 @@ discard block |
||
108 | 108 | // It's a joined result |
109 | 109 | |
110 | 110 | $parent = $this->_rsm->parentAliasMap[$dqlAlias]; |
111 | - $path = $parent . '.' . $dqlAlias; |
|
111 | + $path = $parent.'.'.$dqlAlias; |
|
112 | 112 | |
113 | 113 | // missing parent data, skipping as RIGHT JOIN hydration is not supported. |
114 | - if ( ! isset($nonemptyComponents[$parent]) ) { |
|
114 | + if ( ! isset($nonemptyComponents[$parent])) { |
|
115 | 115 | continue; |
116 | 116 | } |
117 | 117 | |
@@ -120,9 +120,9 @@ discard block |
||
120 | 120 | if ($this->_rsm->isMixed && isset($this->_rootAliases[$parent])) { |
121 | 121 | $first = reset($this->_resultPointers); |
122 | 122 | // TODO: Exception if $key === null ? |
123 | - $baseElement =& $this->_resultPointers[$parent][key($first)]; |
|
123 | + $baseElement = & $this->_resultPointers[$parent][key($first)]; |
|
124 | 124 | } else if (isset($this->_resultPointers[$parent])) { |
125 | - $baseElement =& $this->_resultPointers[$parent]; |
|
125 | + $baseElement = & $this->_resultPointers[$parent]; |
|
126 | 126 | } else { |
127 | 127 | unset($this->_resultPointers[$dqlAlias]); // Ticket #1228 |
128 | 128 | |
@@ -173,7 +173,7 @@ discard block |
||
173 | 173 | } |
174 | 174 | } |
175 | 175 | |
176 | - $coll =& $baseElement[$relationAlias]; |
|
176 | + $coll = & $baseElement[$relationAlias]; |
|
177 | 177 | |
178 | 178 | if (is_array($coll)) { |
179 | 179 | $this->updateResultPointer($coll, $index, $dqlAlias, $oneToOne); |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | $entityKey = $this->_rsm->entityMappings[$dqlAlias] ?: 0; |
186 | 186 | |
187 | 187 | // if this row has a NULL value for the root result id then make it a null result. |
188 | - if ( ! isset($nonemptyComponents[$dqlAlias]) ) { |
|
188 | + if ( ! isset($nonemptyComponents[$dqlAlias])) { |
|
189 | 189 | $result[] = $this->_rsm->isMixed |
190 | 190 | ? [$entityKey => null] |
191 | 191 | : null; |
@@ -246,7 +246,7 @@ discard block |
||
246 | 246 | $resultKey = $this->_resultCounter - 1; |
247 | 247 | } |
248 | 248 | |
249 | - $scalarCount = (isset($rowData['scalars'])? count($rowData['scalars']): 0); |
|
249 | + $scalarCount = (isset($rowData['scalars']) ? count($rowData['scalars']) : 0); |
|
250 | 250 | |
251 | 251 | foreach ($rowData['newObjects'] as $objIndex => $newObject) { |
252 | 252 | $class = $newObject['class']; |
@@ -284,13 +284,13 @@ discard block |
||
284 | 284 | } |
285 | 285 | |
286 | 286 | if ($oneToOne) { |
287 | - $this->_resultPointers[$dqlAlias] =& $coll; |
|
287 | + $this->_resultPointers[$dqlAlias] = & $coll; |
|
288 | 288 | |
289 | 289 | return; |
290 | 290 | } |
291 | 291 | |
292 | 292 | if ($index !== false) { |
293 | - $this->_resultPointers[$dqlAlias] =& $coll[$index]; |
|
293 | + $this->_resultPointers[$dqlAlias] = & $coll[$index]; |
|
294 | 294 | |
295 | 295 | return; |
296 | 296 | } |
@@ -300,7 +300,7 @@ discard block |
||
300 | 300 | } |
301 | 301 | |
302 | 302 | end($coll); |
303 | - $this->_resultPointers[$dqlAlias] =& $coll[key($coll)]; |
|
303 | + $this->_resultPointers[$dqlAlias] = & $coll[key($coll)]; |
|
304 | 304 | |
305 | 305 | return; |
306 | 306 | } |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | $expressionList[] = $this->dispatch($child); |
115 | 115 | } |
116 | 116 | |
117 | - switch($expr->getType()) { |
|
117 | + switch ($expr->getType()) { |
|
118 | 118 | case CompositeExpression::TYPE_AND: |
119 | 119 | return new Expr\Andx($expressionList); |
120 | 120 | |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | return new Expr\Orx($expressionList); |
123 | 123 | |
124 | 124 | default: |
125 | - throw new \RuntimeException("Unknown composite " . $expr->getType()); |
|
125 | + throw new \RuntimeException("Unknown composite ".$expr->getType()); |
|
126 | 126 | } |
127 | 127 | } |
128 | 128 | |
@@ -136,10 +136,10 @@ discard block |
||
136 | 136 | throw new QueryException('No aliases are set before invoking walkComparison().'); |
137 | 137 | } |
138 | 138 | |
139 | - $field = $this->queryAliases[0] . '.' . $comparison->getField(); |
|
139 | + $field = $this->queryAliases[0].'.'.$comparison->getField(); |
|
140 | 140 | |
141 | - foreach($this->queryAliases as $alias) { |
|
142 | - if(strpos($comparison->getField() . '.', $alias . '.') === 0) { |
|
141 | + foreach ($this->queryAliases as $alias) { |
|
142 | + if (strpos($comparison->getField().'.', $alias.'.') === 0) { |
|
143 | 143 | $field = $comparison->getField(); |
144 | 144 | break; |
145 | 145 | } |
@@ -149,13 +149,13 @@ discard block |
||
149 | 149 | |
150 | 150 | foreach ($this->parameters as $parameter) { |
151 | 151 | if ($parameter->getName() === $parameterName) { |
152 | - $parameterName .= '_' . count($this->parameters); |
|
152 | + $parameterName .= '_'.count($this->parameters); |
|
153 | 153 | break; |
154 | 154 | } |
155 | 155 | } |
156 | 156 | |
157 | 157 | $parameter = new Parameter($parameterName, $this->walkValue($comparison->getValue())); |
158 | - $placeholder = ':' . $parameterName; |
|
158 | + $placeholder = ':'.$parameterName; |
|
159 | 159 | |
160 | 160 | switch ($comparison->getOperator()) { |
161 | 161 | case Comparison::IN: |
@@ -182,17 +182,17 @@ discard block |
||
182 | 182 | |
183 | 183 | return $this->expr->neq($field, $placeholder); |
184 | 184 | case Comparison::CONTAINS: |
185 | - $parameter->setValue('%' . $parameter->getValue() . '%', $parameter->getType()); |
|
185 | + $parameter->setValue('%'.$parameter->getValue().'%', $parameter->getType()); |
|
186 | 186 | $this->parameters[] = $parameter; |
187 | 187 | |
188 | 188 | return $this->expr->like($field, $placeholder); |
189 | 189 | case Comparison::STARTS_WITH: |
190 | - $parameter->setValue($parameter->getValue() . '%', $parameter->getType()); |
|
190 | + $parameter->setValue($parameter->getValue().'%', $parameter->getType()); |
|
191 | 191 | $this->parameters[] = $parameter; |
192 | 192 | |
193 | 193 | return $this->expr->like($field, $placeholder); |
194 | 194 | case Comparison::ENDS_WITH: |
195 | - $parameter->setValue('%' . $parameter->getValue(), $parameter->getType()); |
|
195 | + $parameter->setValue('%'.$parameter->getValue(), $parameter->getType()); |
|
196 | 196 | $this->parameters[] = $parameter; |
197 | 197 | |
198 | 198 | return $this->expr->like($field, $placeholder); |
@@ -208,7 +208,7 @@ discard block |
||
208 | 208 | ); |
209 | 209 | } |
210 | 210 | |
211 | - throw new \RuntimeException("Unknown comparison operator: " . $comparison->getOperator()); |
|
211 | + throw new \RuntimeException("Unknown comparison operator: ".$comparison->getOperator()); |
|
212 | 212 | } |
213 | 213 | } |
214 | 214 |
@@ -284,7 +284,7 @@ discard block |
||
284 | 284 | $message = "The mapping of field '{$field}' is invalid: The option '{$expectedOption}' is required."; |
285 | 285 | |
286 | 286 | if ( ! empty($hint)) { |
287 | - $message .= ' (Hint: ' . $hint . ')'; |
|
287 | + $message .= ' (Hint: '.$hint.')'; |
|
288 | 288 | } |
289 | 289 | |
290 | 290 | return new self($message); |
@@ -314,7 +314,7 @@ discard block |
||
314 | 314 | */ |
315 | 315 | public static function reflectionFailure($entity, \ReflectionException $previousException) |
316 | 316 | { |
317 | - return new self('An error occurred in ' . $entity, 0, $previousException); |
|
317 | + return new self('An error occurred in '.$entity, 0, $previousException); |
|
318 | 318 | } |
319 | 319 | |
320 | 320 | /** |
@@ -325,8 +325,8 @@ discard block |
||
325 | 325 | */ |
326 | 326 | public static function joinColumnMustPointToMappedField($className, $joinColumn) |
327 | 327 | { |
328 | - return new self('The column ' . $joinColumn . ' must be mapped to a field in class ' |
|
329 | - . $className . ' since it is referenced by a join column of another class.'); |
|
328 | + return new self('The column '.$joinColumn.' must be mapped to a field in class ' |
|
329 | + . $className.' since it is referenced by a join column of another class.'); |
|
330 | 330 | } |
331 | 331 | |
332 | 332 | /** |
@@ -431,7 +431,7 @@ discard block |
||
431 | 431 | */ |
432 | 432 | public static function noIdDefined($entity) |
433 | 433 | { |
434 | - return new self('No ID defined for entity ' . $entity); |
|
434 | + return new self('No ID defined for entity '.$entity); |
|
435 | 435 | } |
436 | 436 | |
437 | 437 | /** |
@@ -456,12 +456,12 @@ discard block |
||
456 | 456 | public static function fileMappingDriversRequireConfiguredDirectoryPath($path = null) |
457 | 457 | { |
458 | 458 | if ( ! empty($path)) { |
459 | - $path = '[' . $path . ']'; |
|
459 | + $path = '['.$path.']'; |
|
460 | 460 | } |
461 | 461 | |
462 | 462 | return new self( |
463 | - 'File mapping drivers must have a valid directory path, ' . |
|
464 | - 'however the given path ' . $path . ' seems to be incorrect!' |
|
463 | + 'File mapping drivers must have a valid directory path, '. |
|
464 | + 'however the given path '.$path.' seems to be incorrect!' |
|
465 | 465 | ); |
466 | 466 | } |
467 | 467 | |
@@ -492,11 +492,11 @@ discard block |
||
492 | 492 | public static function duplicateDiscriminatorEntry($className, array $entries, array $map) |
493 | 493 | { |
494 | 494 | return new self( |
495 | - "The entries " . implode(', ', $entries) . " in discriminator map of class '" . $className . "' is duplicated. " . |
|
496 | - "If the discriminator map is automatically generated you have to convert it to an explicit discriminator map now. " . |
|
497 | - "The entries of the current map are: @DiscriminatorMap({" . implode(', ', array_map( |
|
495 | + "The entries ".implode(', ', $entries)." in discriminator map of class '".$className."' is duplicated. ". |
|
496 | + "If the discriminator map is automatically generated you have to convert it to an explicit discriminator map now. ". |
|
497 | + "The entries of the current map are: @DiscriminatorMap({".implode(', ', array_map( |
|
498 | 498 | function($a, $b) { return "'$a': '$b'"; }, array_keys($map), array_values($map) |
499 | - )) . "})" |
|
499 | + ))."})" |
|
500 | 500 | ); |
501 | 501 | } |
502 | 502 | |
@@ -643,7 +643,7 @@ discard block |
||
643 | 643 | public static function illegalOrphanRemoval($className, $field) |
644 | 644 | { |
645 | 645 | return new self("Orphan removal is only allowed on one-to-one and one-to-many ". |
646 | - "associations, but " . $className."#" .$field . " is not."); |
|
646 | + "associations, but ".$className."#".$field." is not."); |
|
647 | 647 | } |
648 | 648 | |
649 | 649 | /** |
@@ -675,7 +675,7 @@ discard block |
||
675 | 675 | */ |
676 | 676 | public static function noInheritanceOnMappedSuperClass($className) |
677 | 677 | { |
678 | - return new self("It is not supported to define inheritance information on a mapped superclass '" . $className . "'."); |
|
678 | + return new self("It is not supported to define inheritance information on a mapped superclass '".$className."'."); |
|
679 | 679 | } |
680 | 680 | |
681 | 681 | /** |
@@ -687,8 +687,8 @@ discard block |
||
687 | 687 | public static function mappedClassNotPartOfDiscriminatorMap($className, $rootClassName) |
688 | 688 | { |
689 | 689 | return new self( |
690 | - "Entity '" . $className . "' has to be part of the discriminator map of '" . $rootClassName . "' " . |
|
691 | - "to be properly mapped in the inheritance hierarchy. Alternatively you can make '".$className."' an abstract class " . |
|
690 | + "Entity '".$className."' has to be part of the discriminator map of '".$rootClassName."' ". |
|
691 | + "to be properly mapped in the inheritance hierarchy. Alternatively you can make '".$className."' an abstract class ". |
|
692 | 692 | "to avoid this exception from occurring." |
693 | 693 | ); |
694 | 694 | } |
@@ -701,7 +701,7 @@ discard block |
||
701 | 701 | */ |
702 | 702 | public static function lifecycleCallbackMethodNotFound($className, $methodName) |
703 | 703 | { |
704 | - return new self("Entity '" . $className . "' has no method '" . $methodName . "' to be registered as lifecycle callback."); |
|
704 | + return new self("Entity '".$className."' has no method '".$methodName."' to be registered as lifecycle callback."); |
|
705 | 705 | } |
706 | 706 | |
707 | 707 | /** |
@@ -747,7 +747,7 @@ discard block |
||
747 | 747 | */ |
748 | 748 | public static function invalidFetchMode($className, $annotation) |
749 | 749 | { |
750 | - return new self("Entity '" . $className . "' has a mapping with invalid fetch mode '" . $annotation . "'"); |
|
750 | + return new self("Entity '".$className."' has a mapping with invalid fetch mode '".$annotation."'"); |
|
751 | 751 | } |
752 | 752 | |
753 | 753 | /** |
@@ -757,7 +757,7 @@ discard block |
||
757 | 757 | */ |
758 | 758 | public static function compositeKeyAssignedIdGeneratorRequired($className) |
759 | 759 | { |
760 | - return new self("Entity '". $className . "' has a composite identifier but uses an ID generator other than manually assigning (Identity, Sequence). This is not supported."); |
|
760 | + return new self("Entity '".$className."' has a composite identifier but uses an ID generator other than manually assigning (Identity, Sequence). This is not supported."); |
|
761 | 761 | } |
762 | 762 | |
763 | 763 | /** |
@@ -769,7 +769,7 @@ discard block |
||
769 | 769 | */ |
770 | 770 | public static function invalidTargetEntityClass($targetEntity, $sourceEntity, $associationName) |
771 | 771 | { |
772 | - return new self("The target-entity " . $targetEntity . " cannot be found in '" . $sourceEntity."#".$associationName."'."); |
|
772 | + return new self("The target-entity ".$targetEntity." cannot be found in '".$sourceEntity."#".$associationName."'."); |
|
773 | 773 | } |
774 | 774 | |
775 | 775 | /** |
@@ -781,7 +781,7 @@ discard block |
||
781 | 781 | */ |
782 | 782 | public static function invalidCascadeOption(array $cascades, $className, $propertyName) |
783 | 783 | { |
784 | - $cascades = implode(", ", array_map(function ($e) { return "'" . $e . "'"; }, $cascades)); |
|
784 | + $cascades = implode(", ", array_map(function($e) { return "'".$e."'"; }, $cascades)); |
|
785 | 785 | |
786 | 786 | return new self(sprintf( |
787 | 787 | "You have specified invalid cascade options for %s::$%s: %s; available options: 'remove', 'persist', 'refresh', 'merge', and 'detach'", |
@@ -813,7 +813,7 @@ discard block |
||
813 | 813 | { |
814 | 814 | return new self( |
815 | 815 | sprintf( |
816 | - 'Infinite nesting detected for embedded property %s::%s. ' . |
|
816 | + 'Infinite nesting detected for embedded property %s::%s. '. |
|
817 | 817 | 'You cannot embed an embeddable from the same type inside an embeddable.', |
818 | 818 | $className, |
819 | 819 | $propertyName |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | $sql = $type->convertToPHPValueSQL($sql, $this->platform); |
77 | 77 | } |
78 | 78 | |
79 | - return $sql . ' AS ' . $columnAlias; |
|
79 | + return $sql.' AS '.$columnAlias; |
|
80 | 80 | } |
81 | 81 | |
82 | 82 | /** |
@@ -94,6 +94,6 @@ discard block |
||
94 | 94 | |
95 | 95 | $this->currentPersisterContext->rsm->addMetaResult('r', $columnAlias, $joinColumnName, false, $type); |
96 | 96 | |
97 | - return $tableAlias . '.' . $quotedColumnName . ' AS ' . $columnAlias; |
|
97 | + return $tableAlias.'.'.$quotedColumnName.' AS '.$columnAlias; |
|
98 | 98 | } |
99 | 99 | } |
@@ -215,12 +215,12 @@ discard block |
||
215 | 215 | null === $this->fileLockRegionDirectory |
216 | 216 | ) { |
217 | 217 | throw new \LogicException( |
218 | - 'If you want to use a "READ_WRITE" cache an implementation of "Doctrine\ORM\Cache\ConcurrentRegion" is required, ' . |
|
218 | + 'If you want to use a "READ_WRITE" cache an implementation of "Doctrine\ORM\Cache\ConcurrentRegion" is required, '. |
|
219 | 219 | 'The default implementation provided by doctrine is "Doctrine\ORM\Cache\Region\FileLockRegion" if you want to use it please provide a valid directory, DefaultCacheFactory#setFileLockRegionDirectory(). ' |
220 | 220 | ); |
221 | 221 | } |
222 | 222 | |
223 | - $directory = $this->fileLockRegionDirectory . DIRECTORY_SEPARATOR . $cache['region']; |
|
223 | + $directory = $this->fileLockRegionDirectory.DIRECTORY_SEPARATOR.$cache['region']; |
|
224 | 224 | $region = new FileLockRegion($region, $directory, $this->regionsConfig->getLockLifetime($cache['region'])); |
225 | 225 | } |
226 | 226 | |
@@ -236,7 +236,7 @@ discard block |
||
236 | 236 | { |
237 | 237 | $cacheAdapter = clone $this->cache; |
238 | 238 | |
239 | - if (!$cacheAdapter instanceof CacheProvider) { |
|
239 | + if ( ! $cacheAdapter instanceof CacheProvider) { |
|
240 | 240 | return $cacheAdapter; |
241 | 241 | } |
242 | 242 | |
@@ -246,7 +246,7 @@ discard block |
||
246 | 246 | $namespace .= ':'; |
247 | 247 | } |
248 | 248 | |
249 | - $cacheAdapter->setNamespace($namespace . $name); |
|
249 | + $cacheAdapter->setNamespace($namespace.$name); |
|
250 | 250 | |
251 | 251 | return $cacheAdapter; |
252 | 252 | } |
@@ -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 | /** |
@@ -207,7 +207,7 @@ discard block |
||
207 | 207 | } |
208 | 208 | |
209 | 209 | foreach ($data as $columnName => $value) { |
210 | - if (!is_array($id) || !isset($id[$columnName])) { |
|
210 | + if ( ! is_array($id) || ! isset($id[$columnName])) { |
|
211 | 211 | $stmt->bindValue($paramIndex++, $value, $this->columnTypes[$columnName]); |
212 | 212 | } |
213 | 213 | } |
@@ -322,7 +322,7 @@ discard block |
||
322 | 322 | // If the current class in the root entity, add the filters |
323 | 323 | if ($filterSql = $this->generateFilterConditionSQL($this->em->getClassMetadata($this->class->rootEntityName), $this->getSQLTableAlias($this->class->rootEntityName))) { |
324 | 324 | $conditionSql .= $conditionSql |
325 | - ? ' AND ' . $filterSql |
|
325 | + ? ' AND '.$filterSql |
|
326 | 326 | : $filterSql; |
327 | 327 | } |
328 | 328 | |
@@ -341,29 +341,29 @@ discard block |
||
341 | 341 | switch ($lockMode) { |
342 | 342 | case LockMode::PESSIMISTIC_READ: |
343 | 343 | |
344 | - $lockSql = ' ' . $this->platform->getReadLockSQL(); |
|
344 | + $lockSql = ' '.$this->platform->getReadLockSQL(); |
|
345 | 345 | |
346 | 346 | break; |
347 | 347 | |
348 | 348 | case LockMode::PESSIMISTIC_WRITE: |
349 | 349 | |
350 | - $lockSql = ' ' . $this->platform->getWriteLockSQL(); |
|
350 | + $lockSql = ' '.$this->platform->getWriteLockSQL(); |
|
351 | 351 | |
352 | 352 | break; |
353 | 353 | } |
354 | 354 | |
355 | 355 | $tableName = $this->quoteStrategy->getTableName($this->class, $this->platform); |
356 | - $from = ' FROM ' . $tableName . ' ' . $baseTableAlias; |
|
357 | - $where = $conditionSql != '' ? ' WHERE ' . $conditionSql : ''; |
|
356 | + $from = ' FROM '.$tableName.' '.$baseTableAlias; |
|
357 | + $where = $conditionSql != '' ? ' WHERE '.$conditionSql : ''; |
|
358 | 358 | $lock = $this->platform->appendLockHint($from, $lockMode); |
359 | 359 | $columnList = $this->getSelectColumnsSQL(); |
360 | - $query = 'SELECT ' . $columnList |
|
360 | + $query = 'SELECT '.$columnList |
|
361 | 361 | . $lock |
362 | 362 | . $joinSql |
363 | 363 | . $where |
364 | 364 | . $orderBySql; |
365 | 365 | |
366 | - return $this->platform->modifyLimitQuery($query, $limit, $offset) . $lockSql; |
|
366 | + return $this->platform->modifyLimitQuery($query, $limit, $offset).$lockSql; |
|
367 | 367 | } |
368 | 368 | |
369 | 369 | /** |
@@ -383,14 +383,14 @@ discard block |
||
383 | 383 | |
384 | 384 | if ('' !== $filterSql) { |
385 | 385 | $conditionSql = $conditionSql |
386 | - ? $conditionSql . ' AND ' . $filterSql |
|
386 | + ? $conditionSql.' AND '.$filterSql |
|
387 | 387 | : $filterSql; |
388 | 388 | } |
389 | 389 | |
390 | 390 | $sql = 'SELECT COUNT(*) ' |
391 | - . 'FROM ' . $tableName . ' ' . $baseTableAlias |
|
391 | + . 'FROM '.$tableName.' '.$baseTableAlias |
|
392 | 392 | . $joinSql |
393 | - . (empty($conditionSql) ? '' : ' WHERE ' . $conditionSql); |
|
393 | + . (empty($conditionSql) ? '' : ' WHERE '.$conditionSql); |
|
394 | 394 | |
395 | 395 | return $sql; |
396 | 396 | } |
@@ -409,16 +409,16 @@ discard block |
||
409 | 409 | $conditions = []; |
410 | 410 | $tableAlias = $this->getSQLTableAlias($parentClassName); |
411 | 411 | $parentClass = $this->em->getClassMetadata($parentClassName); |
412 | - $joinSql .= ' INNER JOIN ' . $this->quoteStrategy->getTableName($parentClass, $this->platform) . ' ' . $tableAlias . ' ON '; |
|
412 | + $joinSql .= ' INNER JOIN '.$this->quoteStrategy->getTableName($parentClass, $this->platform).' '.$tableAlias.' ON '; |
|
413 | 413 | |
414 | 414 | foreach ($identifierColumns as $idColumn) { |
415 | - $conditions[] = $baseTableAlias . '.' . $idColumn . ' = ' . $tableAlias . '.' . $idColumn; |
|
415 | + $conditions[] = $baseTableAlias.'.'.$idColumn.' = '.$tableAlias.'.'.$idColumn; |
|
416 | 416 | } |
417 | 417 | |
418 | 418 | $joinSql .= implode(' AND ', $conditions); |
419 | 419 | } |
420 | 420 | |
421 | - return parent::getLockTablesSql($lockMode) . $joinSql; |
|
421 | + return parent::getLockTablesSql($lockMode).$joinSql; |
|
422 | 422 | } |
423 | 423 | |
424 | 424 | /** |
@@ -479,7 +479,7 @@ discard block |
||
479 | 479 | ? $baseTableAlias |
480 | 480 | : $this->getSQLTableAlias($this->class->rootEntityName); |
481 | 481 | |
482 | - $columnList[] = $tableAlias . '.' . $discrColumn; |
|
482 | + $columnList[] = $tableAlias.'.'.$discrColumn; |
|
483 | 483 | |
484 | 484 | // sub tables |
485 | 485 | foreach ($this->class->subClasses as $subClassName) { |
@@ -586,11 +586,11 @@ discard block |
||
586 | 586 | $conditions = []; |
587 | 587 | $parentClass = $this->em->getClassMetadata($parentClassName); |
588 | 588 | $tableAlias = $this->getSQLTableAlias($parentClassName); |
589 | - $joinSql .= ' INNER JOIN ' . $this->quoteStrategy->getTableName($parentClass, $this->platform) . ' ' . $tableAlias . ' ON '; |
|
589 | + $joinSql .= ' INNER JOIN '.$this->quoteStrategy->getTableName($parentClass, $this->platform).' '.$tableAlias.' ON '; |
|
590 | 590 | |
591 | 591 | |
592 | 592 | foreach ($identifierColumn as $idColumn) { |
593 | - $conditions[] = $baseTableAlias . '.' . $idColumn . ' = ' . $tableAlias . '.' . $idColumn; |
|
593 | + $conditions[] = $baseTableAlias.'.'.$idColumn.' = '.$tableAlias.'.'.$idColumn; |
|
594 | 594 | } |
595 | 595 | |
596 | 596 | $joinSql .= implode(' AND ', $conditions); |
@@ -601,10 +601,10 @@ discard block |
||
601 | 601 | $conditions = []; |
602 | 602 | $subClass = $this->em->getClassMetadata($subClassName); |
603 | 603 | $tableAlias = $this->getSQLTableAlias($subClassName); |
604 | - $joinSql .= ' LEFT JOIN ' . $this->quoteStrategy->getTableName($subClass, $this->platform) . ' ' . $tableAlias . ' ON '; |
|
604 | + $joinSql .= ' LEFT JOIN '.$this->quoteStrategy->getTableName($subClass, $this->platform).' '.$tableAlias.' ON '; |
|
605 | 605 | |
606 | 606 | foreach ($identifierColumn as $idColumn) { |
607 | - $conditions[] = $baseTableAlias . '.' . $idColumn . ' = ' . $tableAlias . '.' . $idColumn; |
|
607 | + $conditions[] = $baseTableAlias.'.'.$idColumn.' = '.$tableAlias.'.'.$idColumn; |
|
608 | 608 | } |
609 | 609 | |
610 | 610 | $joinSql .= implode(' AND ', $conditions); |
@@ -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 |