Completed
Pull Request — master (#5938)
by Maximilian
16:49 queued 08:43
created
lib/Doctrine/ORM/Tools/DebugUnitOfWorkListener.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -87,42 +87,42 @@
 block discarded – undo
87 87
 
88 88
         fwrite($fh, "Flush Operation [".$this->context."] - Dumping identity map:\n");
89 89
         foreach ($identityMap as $className => $map) {
90
-            fwrite($fh, "Class: ". $className . "\n");
90
+            fwrite($fh, "Class: ".$className."\n");
91 91
 
92 92
             foreach ($map as $entity) {
93
-                fwrite($fh, " Entity: " . $this->getIdString($entity, $uow) . " " . spl_object_hash($entity)."\n");
93
+                fwrite($fh, " Entity: ".$this->getIdString($entity, $uow)." ".spl_object_hash($entity)."\n");
94 94
                 fwrite($fh, "  Associations:\n");
95 95
 
96 96
                 $cm = $em->getClassMetadata($className);
97 97
 
98 98
                 foreach ($cm->associationMappings as $field => $assoc) {
99
-                    fwrite($fh, "   " . $field . " ");
99
+                    fwrite($fh, "   ".$field." ");
100 100
                     $value = $cm->getFieldValue($entity, $field);
101 101
 
102 102
                     if ($assoc['type'] & ClassMetadata::TO_ONE) {
103 103
                         if ($value === null) {
104 104
                             fwrite($fh, " NULL\n");
105 105
                         } else {
106
-                            if ($value instanceof Proxy && !$value->__isInitialized()) {
106
+                            if ($value instanceof Proxy && ! $value->__isInitialized()) {
107 107
                                 fwrite($fh, "[PROXY] ");
108 108
                             }
109 109
 
110
-                            fwrite($fh, $this->getIdString($value, $uow) . " " . spl_object_hash($value) . "\n");
110
+                            fwrite($fh, $this->getIdString($value, $uow)." ".spl_object_hash($value)."\n");
111 111
                         }
112 112
                     } else {
113
-                        $initialized = !($value instanceof PersistentCollection) || $value->isInitialized();
113
+                        $initialized = ! ($value instanceof PersistentCollection) || $value->isInitialized();
114 114
                         if ($value === null) {
115 115
                             fwrite($fh, " NULL\n");
116 116
                         } elseif ($initialized) {
117
-                            fwrite($fh, "[INITIALIZED] " . $this->getType($value). " " . count($value) . " elements\n");
117
+                            fwrite($fh, "[INITIALIZED] ".$this->getType($value)." ".count($value)." elements\n");
118 118
 
119 119
                             foreach ($value as $obj) {
120
-                                fwrite($fh, "    " . $this->getIdString($obj, $uow) . " " . spl_object_hash($obj)."\n");
120
+                                fwrite($fh, "    ".$this->getIdString($obj, $uow)." ".spl_object_hash($obj)."\n");
121 121
                             }
122 122
                         } else {
123
-                            fwrite($fh, "[PROXY] " . $this->getType($value) . " unknown element size\n");
123
+                            fwrite($fh, "[PROXY] ".$this->getType($value)." unknown element size\n");
124 124
                             foreach ($value->unwrap() as $obj) {
125
-                                fwrite($fh, "    " . $this->getIdString($obj, $uow) . " " . spl_object_hash($obj)."\n");
125
+                                fwrite($fh, "    ".$this->getIdString($obj, $uow)." ".spl_object_hash($obj)."\n");
126 126
                             }
127 127
                         }
128 128
                     }
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Tools/EntityRepositoryGenerator.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -143,7 +143,7 @@
 block discarded – undo
143 143
         $code = $this->generateEntityRepositoryClass($fullClassName);
144 144
 
145 145
         $path = $outputDirectory . DIRECTORY_SEPARATOR
146
-              . str_replace('\\', \DIRECTORY_SEPARATOR, $fullClassName) . '.php';
146
+                . str_replace('\\', \DIRECTORY_SEPARATOR, $fullClassName) . '.php';
147 147
         $dir = dirname($path);
148 148
 
149 149
         if ( ! is_dir($dir)) {
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
     {
112 112
         $namespace = $this->getClassNamespace($fullClassName);
113 113
 
114
-        return $namespace ? 'namespace ' . $namespace . ';' : '';
114
+        return $namespace ? 'namespace '.$namespace.';' : '';
115 115
     }
116 116
 
117 117
     /**
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
         $repositoryName = $this->repositoryName ?: 'Doctrine\ORM\EntityRepository';
127 127
 
128 128
         if ($namespace && $repositoryName[0] !== '\\') {
129
-            $repositoryName = '\\' . $repositoryName;
129
+            $repositoryName = '\\'.$repositoryName;
130 130
         }
131 131
 
132 132
         return $repositoryName;
@@ -142,8 +142,8 @@  discard block
 block discarded – undo
142 142
     {
143 143
         $code = $this->generateEntityRepositoryClass($fullClassName);
144 144
 
145
-        $path = $outputDirectory . DIRECTORY_SEPARATOR
146
-              . str_replace('\\', \DIRECTORY_SEPARATOR, $fullClassName) . '.php';
145
+        $path = $outputDirectory.DIRECTORY_SEPARATOR
146
+              . str_replace('\\', \DIRECTORY_SEPARATOR, $fullClassName).'.php';
147 147
         $dir = dirname($path);
148 148
 
149 149
         if ( ! is_dir($dir)) {
Please login to merge, or discard this patch.
lib/Doctrine/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.
lib/Doctrine/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/Doctrine/ORM/Tools/Pagination/LimitSubqueryOutputWalker.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -209,8 +209,8 @@  discard block
 block discarded – undo
209 209
         $sqlIdentifier = $this->getSQLIdentifier($AST);
210 210
 
211 211
         if ($hasOrderBy) {
212
-            $orderGroupBy = ' GROUP BY ' . implode(', ', $sqlIdentifier);
213
-            $sqlIdentifier[] = 'MIN(' . $this->walkResultVariable('dctrn_rownum') . ') AS dctrn_minrownum';
212
+            $orderGroupBy = ' GROUP BY '.implode(', ', $sqlIdentifier);
213
+            $sqlIdentifier[] = 'MIN('.$this->walkResultVariable('dctrn_rownum').') AS dctrn_minrownum';
214 214
         }
215 215
 
216 216
         // Build the counter query
@@ -221,7 +221,7 @@  discard block
 block discarded – undo
221 221
         );
222 222
 
223 223
         if ($hasOrderBy) {
224
-            $sql .= $orderGroupBy . $outerOrderBy;
224
+            $sql .= $orderGroupBy.$outerOrderBy;
225 225
         }
226 226
 
227 227
         // Apply the limit and offset.
@@ -324,7 +324,7 @@  discard block
 block discarded – undo
324 324
         foreach ($orderByPathExpressions as $pathExpression) {
325 325
             $idVar = $pathExpression->identificationVariable;
326 326
             $field = $pathExpression->field;
327
-            if (!isset($selects[$idVar])) {
327
+            if ( ! isset($selects[$idVar])) {
328 328
                 $selects[$idVar] = [];
329 329
             }
330 330
             $selects[$idVar][$field] = true;
@@ -335,7 +335,7 @@  discard block
 block discarded – undo
335 335
         foreach ($AST->selectClause->selectExpressions as $selectExpression) {
336 336
             if ($selectExpression instanceof SelectExpression) {
337 337
                 $idVar = $selectExpression->expression;
338
-                if (!is_string($idVar)) {
338
+                if ( ! is_string($idVar)) {
339 339
                     continue;
340 340
                 }
341 341
                 $field = $selectExpression->fieldIdentificationVariable;
@@ -368,7 +368,7 @@  discard block
 block discarded – undo
368 368
     {
369 369
         // If the sql statement has an order by clause, we need to wrap it in a new select distinct
370 370
         // statement
371
-        if (! $orderByClause instanceof OrderByClause) {
371
+        if ( ! $orderByClause instanceof OrderByClause) {
372 372
             return $sql;
373 373
         }
374 374
 
@@ -404,7 +404,7 @@  discard block
 block discarded – undo
404 404
             = [];
405 405
 
406 406
         // Generate DQL alias -> SQL table alias mapping
407
-        foreach(array_keys($this->rsm->aliasMap) as $dqlAlias) {
407
+        foreach (array_keys($this->rsm->aliasMap) as $dqlAlias) {
408 408
             $dqlAliasToClassMap[$dqlAlias] = $class = $this->queryComponents[$dqlAlias]['metadata'];
409 409
             $dqlAliasToSqlTableAliasMap[$dqlAlias] = $this->getSQLTableAlias($class->getTableName(), $dqlAlias);
410 410
         }
@@ -413,13 +413,13 @@  discard block
 block discarded – undo
413 413
         $fieldSearchPattern = '/(?<![a-z0-9_])%s\.%s(?![a-z0-9_])/i';
414 414
 
415 415
         // Generate search patterns for each field's path expression in the order by clause
416
-        foreach($this->rsm->fieldMappings as $fieldAlias => $fieldName) {
416
+        foreach ($this->rsm->fieldMappings as $fieldAlias => $fieldName) {
417 417
             $dqlAliasForFieldAlias = $this->rsm->columnOwnerMap[$fieldAlias];
418 418
             $class = $dqlAliasToClassMap[$dqlAliasForFieldAlias];
419 419
 
420 420
             // If the field is from a joined child table, we won't be ordering
421 421
             // on it.
422
-            if (!isset($class->fieldMappings[$fieldName])) {
422
+            if ( ! isset($class->fieldMappings[$fieldName])) {
423 423
                 continue;
424 424
             }
425 425
 
@@ -438,7 +438,7 @@  discard block
 block discarded – undo
438 438
                 // Field was declared in a parent class, so we need to get the proper SQL table alias
439 439
                 // for the joined parent table.
440 440
                 $otherClassMetadata = $this->em->getClassMetadata($fieldMapping['declared']);
441
-                if (!$otherClassMetadata->isMappedSuperclass) {
441
+                if ( ! $otherClassMetadata->isMappedSuperclass) {
442 442
                     $sqlTableAliasForFieldAlias = $this->getSQLTableAlias($otherClassMetadata->getTableName(), $dqlAliasForFieldAlias);
443 443
                 }
444 444
             }
@@ -448,7 +448,7 @@  discard block
 block discarded – undo
448 448
             $replacements[] = $fieldAlias;
449 449
         }
450 450
 
451
-        foreach($orderByClause->orderByItems as $orderByItem) {
451
+        foreach ($orderByClause->orderByItems as $orderByItem) {
452 452
             // Walk order by item to get string representation of it
453 453
             $orderByItemString = $this->walkOrderByItem($orderByItem);
454 454
 
@@ -565,7 +565,7 @@  discard block
 block discarded – undo
565 565
      */
566 566
     public function walkPathExpression($pathExpr)
567 567
     {
568
-        if (!$this->inSubSelect && !$this->platformSupportsRowNumber() && !in_array($pathExpr, $this->orderByPathExpressions)) {
568
+        if ( ! $this->inSubSelect && ! $this->platformSupportsRowNumber() && ! in_array($pathExpr, $this->orderByPathExpressions)) {
569 569
             $this->orderByPathExpressions[] = $pathExpr;
570 570
         }
571 571
 
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Tools/Pagination/LimitSubqueryWalker.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -112,7 +112,7 @@
 block discarded – undo
112 112
                 
113 113
                 $AST->selectClause->selectExpressions[] = new SelectExpression(
114 114
                     $this->createSelectExpressionItem($item->expression),
115
-                    '_dctrn_ord' . $this->_aliasCounter++
115
+                    '_dctrn_ord'.$this->_aliasCounter++
116 116
                 );
117 117
             }
118 118
         }
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Tools/Pagination/RowNumberOverFunction.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -43,9 +43,9 @@
 block discarded – undo
43 43
      */
44 44
     public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
45 45
     {
46
-        return 'ROW_NUMBER() OVER(' . trim($sqlWalker->walkOrderByClause(
46
+        return 'ROW_NUMBER() OVER('.trim($sqlWalker->walkOrderByClause(
47 47
             $this->orderByClause
48
-        )) . ')';
48
+        )).')';
49 49
     }
50 50
 
51 51
     /**
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Tools/Pagination/WhereInWalker.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -100,7 +100,7 @@
 block discarded – undo
100 100
                 array($pathExpression)
101 101
             );
102 102
             $expression = new InExpression($arithmeticExpression);
103
-            $expression->literals[] = new InputParameter(":" . self::PAGINATOR_ID_ALIAS);
103
+            $expression->literals[] = new InputParameter(":".self::PAGINATOR_ID_ALIAS);
104 104
 
105 105
         } else {
106 106
             $expression = new NullComparisonExpression($pathExpression);
Please login to merge, or discard this patch.
lib/Doctrine/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.