Completed
Pull Request — master (#5626)
by Gary
09:09
created
lib/Shitty/ORM/Mapping/Driver/YamlDriver.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
         // Evaluate named native queries
109 109
         if (isset($element['namedNativeQueries'])) {
110 110
             foreach ($element['namedNativeQueries'] as $name => $mappingElement) {
111
-                if (!isset($mappingElement['name'])) {
111
+                if ( ! isset($mappingElement['name'])) {
112 112
                     $mappingElement['name'] = $name;
113 113
                 }
114 114
                 $metadata->addNamedNativeQuery(array(
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
         // Evaluate sql result set mappings
124 124
         if (isset($element['sqlResultSetMappings'])) {
125 125
             foreach ($element['sqlResultSetMappings'] as $name => $resultSetMapping) {
126
-                if (!isset($resultSetMapping['name'])) {
126
+                if ( ! isset($resultSetMapping['name'])) {
127 127
                     $resultSetMapping['name'] = $name;
128 128
                 }
129 129
 
@@ -168,7 +168,7 @@  discard block
 block discarded – undo
168 168
         }
169 169
 
170 170
         if (isset($element['inheritanceType'])) {
171
-            $metadata->setInheritanceType(constant('Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_' . strtoupper($element['inheritanceType'])));
171
+            $metadata->setInheritanceType(constant('Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_'.strtoupper($element['inheritanceType'])));
172 172
 
173 173
             if ($metadata->inheritanceType != \Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_NONE) {
174 174
                 // Evaluate discriminatorColumn
@@ -353,7 +353,7 @@  discard block
 block discarded – undo
353 353
                 }
354 354
 
355 355
                 if (isset($oneToOneElement['fetch'])) {
356
-                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $oneToOneElement['fetch']);
356
+                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.$oneToOneElement['fetch']);
357 357
                 }
358 358
 
359 359
                 if (isset($oneToOneElement['mappedBy'])) {
@@ -407,7 +407,7 @@  discard block
 block discarded – undo
407 407
                 );
408 408
 
409 409
                 if (isset($oneToManyElement['fetch'])) {
410
-                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $oneToManyElement['fetch']);
410
+                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.$oneToManyElement['fetch']);
411 411
                 }
412 412
 
413 413
                 if (isset($oneToManyElement['cascade'])) {
@@ -449,7 +449,7 @@  discard block
 block discarded – undo
449 449
                 }
450 450
 
451 451
                 if (isset($manyToOneElement['fetch'])) {
452
-                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $manyToOneElement['fetch']);
452
+                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.$manyToOneElement['fetch']);
453 453
                 }
454 454
 
455 455
                 if (isset($manyToOneElement['inversedBy'])) {
@@ -494,7 +494,7 @@  discard block
 block discarded – undo
494 494
                 );
495 495
 
496 496
                 if (isset($manyToManyElement['fetch'])) {
497
-                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $manyToManyElement['fetch']);
497
+                    $mapping['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_'.$manyToManyElement['fetch']);
498 498
                 }
499 499
 
500 500
                 if (isset($manyToManyElement['mappedBy'])) {
@@ -564,7 +564,7 @@  discard block
 block discarded – undo
564 564
         if (isset($element['associationOverride']) && is_array($element['associationOverride'])) {
565 565
 
566 566
             foreach ($element['associationOverride'] as $fieldName => $associationOverrideElement) {
567
-                $override   = array();
567
+                $override = array();
568 568
 
569 569
                 // Check for joinColumn
570 570
                 if (isset($associationOverrideElement['joinColumn'])) {
@@ -582,7 +582,7 @@  discard block
 block discarded – undo
582 582
                 if (isset($associationOverrideElement['joinTable'])) {
583 583
 
584 584
                     $joinTableElement   = $associationOverrideElement['joinTable'];
585
-                    $joinTable          =  array(
585
+                    $joinTable          = array(
586 586
                         'name' => $joinTableElement['name']
587 587
                     );
588 588
 
@@ -631,7 +631,7 @@  discard block
 block discarded – undo
631 631
         if (isset($element['lifecycleCallbacks'])) {
632 632
             foreach ($element['lifecycleCallbacks'] as $type => $methods) {
633 633
                 foreach ($methods as $method) {
634
-                    $metadata->addLifecycleCallback($method, constant('Doctrine\ORM\Events::' . $type));
634
+                    $metadata->addLifecycleCallback($method, constant('Doctrine\ORM\Events::'.$type));
635 635
                 }
636 636
             }
637 637
         }
@@ -773,12 +773,12 @@  discard block
 block discarded – undo
773 773
         $region = isset($cacheMapping['region']) ? (string) $cacheMapping['region'] : null;
774 774
         $usage  = isset($cacheMapping['usage']) ? strtoupper($cacheMapping['usage']) : null;
775 775
 
776
-        if ($usage && ! defined('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_' . $usage)) {
776
+        if ($usage && ! defined('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_'.$usage)) {
777 777
             throw new \InvalidArgumentException(sprintf('Invalid cache usage "%s"', $usage));
778 778
         }
779 779
 
780 780
         if ($usage) {
781
-            $usage = constant('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_' . $usage);
781
+            $usage = constant('Doctrine\ORM\Mapping\ClassMetadata::CACHE_USAGE_'.$usage);
782 782
         }
783 783
 
784 784
         return array(
Please login to merge, or discard this patch.
lib/Shitty/ORM/Mapping/Driver/DatabaseDriver.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
175 175
         $this->reverseEngineerMappingFromDatabase();
176 176
 
177 177
         if ( ! isset($this->classToTableNames[$className])) {
178
-            throw new \InvalidArgumentException("Unknown class " . $className);
178
+            throw new \InvalidArgumentException("Unknown class ".$className);
179 179
         }
180 180
 
181 181
         $tableName = $this->classToTableNames[$className];
@@ -286,7 +286,7 @@  discard block
 block discarded – undo
286 286
 
287 287
             if ( ! $table->hasPrimaryKey()) {
288 288
                 throw new MappingException(
289
-                    "Table " . $table->getName() . " has no primary key. Doctrine does not ".
289
+                    "Table ".$table->getName()." has no primary key. Doctrine does not ".
290 290
                     "support reverse engineering from tables that don't have a primary key."
291 291
                 );
292 292
             }
@@ -407,7 +407,7 @@  discard block
 block discarded – undo
407 407
             case Type::STRING:
408 408
             case Type::TEXT:
409 409
                 $fieldMapping['length'] = $column->getLength();
410
-                $fieldMapping['options']['fixed']  = $column->getFixed();
410
+                $fieldMapping['options']['fixed'] = $column->getFixed();
411 411
                 break;
412 412
 
413 413
             case Type::DECIMAL:
@@ -523,10 +523,10 @@  discard block
 block discarded – undo
523 523
     private function getClassNameForTable($tableName)
524 524
     {
525 525
         if (isset($this->classNamesForTables[$tableName])) {
526
-            return $this->namespace . $this->classNamesForTables[$tableName];
526
+            return $this->namespace.$this->classNamesForTables[$tableName];
527 527
         }
528 528
 
529
-        return $this->namespace . Inflector::classify(strtolower($tableName));
529
+        return $this->namespace.Inflector::classify(strtolower($tableName));
530 530
     }
531 531
 
532 532
     /**
Please login to merge, or discard this patch.
lib/Shitty/ORM/Proxy/ProxyFactory.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
     {
126 126
         $wakeupProxy = $classMetadata->getReflectionClass()->hasMethod('__wakeup');
127 127
 
128
-        return function (BaseProxy $proxy) use ($entityPersister, $classMetadata, $wakeupProxy) {
128
+        return function(BaseProxy $proxy) use ($entityPersister, $classMetadata, $wakeupProxy) {
129 129
             $initializer = $proxy->__getInitializer();
130 130
             $cloner      = $proxy->__getCloner();
131 131
 
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
177 177
      */
178 178
     private function createCloner(ClassMetadata $classMetadata, EntityPersister $entityPersister)
179 179
     {
180
-        return function (BaseProxy $proxy) use ($entityPersister, $classMetadata) {
180
+        return function(BaseProxy $proxy) use ($entityPersister, $classMetadata) {
181 181
             if ($proxy->__isInitialized()) {
182 182
                 return;
183 183
             }
Please login to merge, or discard this patch.
lib/Shitty/ORM/Tools/Export/Driver/PhpExporter.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -51,27 +51,27 @@  discard block
 block discarded – undo
51 51
         }
52 52
 
53 53
         if ($metadata->inheritanceType) {
54
-            $lines[] = '$metadata->setInheritanceType(ClassMetadataInfo::INHERITANCE_TYPE_' . $this->_getInheritanceTypeString($metadata->inheritanceType) . ');';
54
+            $lines[] = '$metadata->setInheritanceType(ClassMetadataInfo::INHERITANCE_TYPE_'.$this->_getInheritanceTypeString($metadata->inheritanceType).');';
55 55
         }
56 56
 
57 57
         if ($metadata->customRepositoryClassName) {
58
-            $lines[] = "\$metadata->customRepositoryClassName = '" . $metadata->customRepositoryClassName . "';";
58
+            $lines[] = "\$metadata->customRepositoryClassName = '".$metadata->customRepositoryClassName."';";
59 59
         }
60 60
 
61 61
         if ($metadata->table) {
62
-            $lines[] = '$metadata->setPrimaryTable(' . $this->_varExport($metadata->table) . ');';
62
+            $lines[] = '$metadata->setPrimaryTable('.$this->_varExport($metadata->table).');';
63 63
         }
64 64
 
65 65
         if ($metadata->discriminatorColumn) {
66
-            $lines[] = '$metadata->setDiscriminatorColumn(' . $this->_varExport($metadata->discriminatorColumn) . ');';
66
+            $lines[] = '$metadata->setDiscriminatorColumn('.$this->_varExport($metadata->discriminatorColumn).');';
67 67
         }
68 68
 
69 69
         if ($metadata->discriminatorMap) {
70
-            $lines[] = '$metadata->setDiscriminatorMap(' . $this->_varExport($metadata->discriminatorMap) . ');';
70
+            $lines[] = '$metadata->setDiscriminatorMap('.$this->_varExport($metadata->discriminatorMap).');';
71 71
         }
72 72
 
73 73
         if ($metadata->changeTrackingPolicy) {
74
-            $lines[] = '$metadata->setChangeTrackingPolicy(ClassMetadataInfo::CHANGETRACKING_' . $this->_getChangeTrackingPolicyString($metadata->changeTrackingPolicy) . ');';
74
+            $lines[] = '$metadata->setChangeTrackingPolicy(ClassMetadataInfo::CHANGETRACKING_'.$this->_getChangeTrackingPolicyString($metadata->changeTrackingPolicy).');';
75 75
         }
76 76
 
77 77
         if ($metadata->lifecycleCallbacks) {
@@ -83,11 +83,11 @@  discard block
 block discarded – undo
83 83
         }
84 84
 
85 85
         foreach ($metadata->fieldMappings as $fieldMapping) {
86
-            $lines[] = '$metadata->mapField(' . $this->_varExport($fieldMapping) . ');';
86
+            $lines[] = '$metadata->mapField('.$this->_varExport($fieldMapping).');';
87 87
         }
88 88
 
89 89
         if ( ! $metadata->isIdentifierComposite && $generatorType = $this->_getIdGeneratorTypeString($metadata->generatorType)) {
90
-            $lines[] = '$metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_' . $generatorType . ');';
90
+            $lines[] = '$metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_'.$generatorType.');';
91 91
         }
92 92
 
93 93
         foreach ($metadata->associationMappings as $associationMapping) {
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
                 $associationMappingArray = array_merge($associationMappingArray, $manyToManyMappingArray);
151 151
             }
152 152
 
153
-            $lines[] = '$metadata->' . $method . '(' . $this->_varExport($associationMappingArray) . ');';
153
+            $lines[] = '$metadata->'.$method.'('.$this->_varExport($associationMappingArray).');';
154 154
         }
155 155
 
156 156
         return implode("\n", $lines);
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
     protected function _varExport($var)
165 165
     {
166 166
         $export = var_export($var, true);
167
-        $export = str_replace("\n", PHP_EOL . str_repeat(' ', 8), $export);
167
+        $export = str_replace("\n", PHP_EOL.str_repeat(' ', 8), $export);
168 168
         $export = str_replace('  ', ' ', $export);
169 169
         $export = str_replace('array (', 'array(', $export);
170 170
         $export = str_replace('array( ', 'array(', $export);
Please login to merge, or discard this patch.
lib/Shitty/ORM/Tools/Export/Driver/AbstractExporter.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
                 if ( ! is_dir($dir)) {
142 142
                     mkdir($dir, 0775, true);
143 143
                 }
144
-                if (file_exists($path) && !$this->_overwriteExistingFiles) {
144
+                if (file_exists($path) && ! $this->_overwriteExistingFiles) {
145 145
                     throw ExportException::attemptOverwriteExistingFile($path);
146 146
                 }
147 147
                 file_put_contents($path, $output);
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
      */
160 160
     protected function _generateOutputPath(ClassMetadataInfo $metadata)
161 161
     {
162
-        return $this->_outputDir . '/' . str_replace('\\', '.', $metadata->name) . $this->_extension;
162
+        return $this->_outputDir.'/'.str_replace('\\', '.', $metadata->name).$this->_extension;
163 163
     }
164 164
 
165 165
     /**
Please login to merge, or discard this patch.
lib/Shitty/ORM/Tools/Export/Driver/AnnotationExporter.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -65,7 +65,7 @@
 block discarded – undo
65 65
      */
66 66
     protected function _generateOutputPath(ClassMetadataInfo $metadata)
67 67
     {
68
-        return $this->_outputDir . '/' . str_replace('\\', '/', $metadata->name) . $this->_extension;
68
+        return $this->_outputDir.'/'.str_replace('\\', '/', $metadata->name).$this->_extension;
69 69
     }
70 70
 
71 71
     /**
Please login to merge, or discard this patch.
lib/Shitty/ORM/Tools/Export/Driver/XmlExporter.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
     public function exportClassMetadata(ClassMetadataInfo $metadata)
42 42
     {
43 43
         $xml = new \SimpleXmlElement("<?xml version=\"1.0\" encoding=\"utf-8\"?><doctrine-mapping ".
44
-            "xmlns=\"http://doctrine-project.org/schemas/orm/doctrine-mapping\" " .
44
+            "xmlns=\"http://doctrine-project.org/schemas/orm/doctrine-mapping\" ".
45 45
             "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" ".
46 46
             "xsi:schemaLocation=\"http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd\" />");
47 47
 
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
 
98 98
         $trackingPolicy = $this->_getChangeTrackingPolicyString($metadata->changeTrackingPolicy);
99 99
 
100
-        if ( $trackingPolicy != 'DEFERRED_IMPLICIT') {
100
+        if ($trackingPolicy != 'DEFERRED_IMPLICIT') {
101 101
             $root->addChild('change-tracking-policy', $trackingPolicy);
102 102
         }
103 103
 
@@ -295,7 +295,7 @@  discard block
 block discarded – undo
295 295
             }
296 296
 
297 297
             if (count($cascade) === 5) {
298
-                $cascade  = array('cascade-all');
298
+                $cascade = array('cascade-all');
299 299
             }
300 300
 
301 301
             if ($cascade) {
@@ -377,7 +377,7 @@  discard block
 block discarded – undo
377 377
             }
378 378
         }
379 379
 
380
-        if (isset($metadata->lifecycleCallbacks) && count($metadata->lifecycleCallbacks)>0) {
380
+        if (isset($metadata->lifecycleCallbacks) && count($metadata->lifecycleCallbacks) > 0) {
381 381
             $lifecycleCallbacksXml = $root->addChild('lifecycle-callbacks');
382 382
 
383 383
             foreach ($metadata->lifecycleCallbacks as $name => $methods) {
@@ -426,7 +426,7 @@  discard block
 block discarded – undo
426 426
     {
427 427
         $sequenceDefinition = $metadata->sequenceGeneratorDefinition;
428 428
 
429
-        if (! ($metadata->generatorType === ClassMetadataInfo::GENERATOR_TYPE_SEQUENCE && $sequenceDefinition)) {
429
+        if ( ! ($metadata->generatorType === ClassMetadataInfo::GENERATOR_TYPE_SEQUENCE && $sequenceDefinition)) {
430 430
             return;
431 431
         }
432 432
 
Please login to merge, or discard this patch.
lib/Shitty/ORM/Tools/Setup.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -44,14 +44,14 @@  discard block
 block discarded – undo
44 44
      */
45 45
     public static function registerAutoloadDirectory($directory)
46 46
     {
47
-        if (!class_exists('Doctrine\Common\ClassLoader', false)) {
48
-            require_once $directory . "/Doctrine/Common/ClassLoader.php";
47
+        if ( ! class_exists('Doctrine\Common\ClassLoader', false)) {
48
+            require_once $directory."/Doctrine/Common/ClassLoader.php";
49 49
         }
50 50
 
51 51
         $loader = new ClassLoader("Doctrine", $directory);
52 52
         $loader->register();
53 53
 
54
-        $loader = new ClassLoader("Symfony\Component", $directory . "/Doctrine");
54
+        $loader = new ClassLoader("Symfony\Component", $directory."/Doctrine");
55 55
         $loader->register();
56 56
     }
57 57
 
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
         }
147 147
 
148 148
         if ($cache instanceof CacheProvider) {
149
-            $cache->setNamespace("dc2_" . md5($proxyDir) . "_"); // to avoid collisions
149
+            $cache->setNamespace("dc2_".md5($proxyDir)."_"); // to avoid collisions
150 150
         }
151 151
 
152 152
         $config = new Configuration();
Please login to merge, or discard this patch.
lib/Shitty/ORM/Tools/SchemaValidator.php 1 patch
Spacing   +57 added lines, -57 removed lines patch added patch discarded remove patch
@@ -89,66 +89,66 @@  discard block
 block discarded – undo
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-existant type '" . $mapping['type'] . "'.";
92
+            if ( ! Type::hasType($mapping['type'])) {
93
+                $ce[] = "The field '".$class->name."#".$fieldName."' uses a non-existant 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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 
Please login to merge, or discard this patch.