Completed
Pull Request — master (#6500)
by Mathew
17:08
created
lib/Doctrine/ORM/Cache/EntityCacheKey.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -52,6 +52,6 @@
 block discarded – undo
52 52
 
53 53
         $this->identifier  = $identifier;
54 54
         $this->entityClass = $entityClass;
55
-        $this->hash        = str_replace('\\', '.', strtolower($entityClass) . '_' . implode(' ', $identifier));
55
+        $this->hash        = str_replace('\\', '.', strtolower($entityClass).'_'.implode(' ', $identifier));
56 56
     }
57 57
 }
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Cache/Lock.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@
 block discarded – undo
45 45
     public function __construct($value, $time = null)
46 46
     {
47 47
         $this->value = $value;
48
-        $this->time  = $time ? : time();
48
+        $this->time  = $time ?: time();
49 49
     }
50 50
 
51 51
     /**
Please login to merge, or discard this patch.
lib/Doctrine/ORM/LazyCriteriaCollection.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -93,7 +93,7 @@
 block discarded – undo
93 93
             return $this->collection->isEmpty();
94 94
         }
95 95
 
96
-        return !$this->count();
96
+        return ! $this->count();
97 97
     }
98 98
 
99 99
     /**
Please login to merge, or discard this patch.
lib/Doctrine/ORM/ORMException.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
      */
47 47
     public static function namedQueryNotFound($queryName)
48 48
     {
49
-        return new self('Could not find a named query by the name "' . $queryName . '"');
49
+        return new self('Could not find a named query by the name "'.$queryName.'"');
50 50
     }
51 51
 
52 52
     /**
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
      */
57 57
     public static function namedNativeQueryNotFound($nativeQueryName)
58 58
     {
59
-        return new self('Could not find a named native query by the name "' . $nativeQueryName . '"');
59
+        return new self('Could not find a named native query by the name "'.$nativeQueryName.'"');
60 60
     }
61 61
 
62 62
     /**
@@ -68,10 +68,10 @@  discard block
 block discarded – undo
68 68
     public static function entityMissingForeignAssignedId($entity, $relatedEntity)
69 69
     {
70 70
         return new self(
71
-            "Entity of type " . get_class($entity) . " has identity through a foreign entity " . get_class($relatedEntity) . ", " .
72
-            "however this entity has no identity itself. You have to call EntityManager#persist() on the related entity " .
73
-            "and make sure that an identifier was generated before trying to persist '" . get_class($entity) . "'. In case " .
74
-            "of Post Insert ID Generation (such as MySQL Auto-Increment) this means you have to call " .
71
+            "Entity of type ".get_class($entity)." has identity through a foreign entity ".get_class($relatedEntity).", ".
72
+            "however this entity has no identity itself. You have to call EntityManager#persist() on the related entity ".
73
+            "and make sure that an identifier was generated before trying to persist '".get_class($entity)."'. In case ".
74
+            "of Post Insert ID Generation (such as MySQL Auto-Increment) this means you have to call ".
75 75
             "EntityManager#flush() between both persist operations."
76 76
         );
77 77
     }
@@ -84,9 +84,9 @@  discard block
 block discarded – undo
84 84
      */
85 85
     public static function entityMissingAssignedIdForField($entity, $field)
86 86
     {
87
-        return new self("Entity of type " . get_class($entity) . " is missing an assigned ID for field  '" . $field . "'. " .
87
+        return new self("Entity of type ".get_class($entity)." is missing an assigned ID for field  '".$field."'. ".
88 88
             "The identifier generation strategy for this entity requires the ID field to be populated before ".
89
-            "EntityManager#persist() is called. If you want automatically generated identifiers instead " .
89
+            "EntityManager#persist() is called. If you want automatically generated identifiers instead ".
90 90
             "you need to adjust the metadata mapping accordingly."
91 91
         );
92 92
     }
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
      */
124 124
     public static function invalidOrientation($className, $field)
125 125
     {
126
-        return new self("Invalid order by orientation specified for " . $className . "#" . $field);
126
+        return new self("Invalid order by orientation specified for ".$className."#".$field);
127 127
     }
128 128
 
129 129
     /**
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
240 240
      */
241 241
     public static function queryCacheUsesNonPersistentCache(CacheDriver $cache)
242 242
     {
243
-        return new self('Query Cache uses a non-persistent cache driver, ' . get_class($cache) . '.');
243
+        return new self('Query Cache uses a non-persistent cache driver, '.get_class($cache).'.');
244 244
     }
245 245
 
246 246
     /**
@@ -250,7 +250,7 @@  discard block
 block discarded – undo
250 250
      */
251 251
     public static function metadataCacheUsesNonPersistentCache(CacheDriver $cache)
252 252
     {
253
-        return new self('Metadata Cache uses a non-persistent cache driver, ' . get_class($cache) . '.');
253
+        return new self('Metadata Cache uses a non-persistent cache driver, '.get_class($cache).'.');
254 254
     }
255 255
 
256 256
     /**
@@ -291,7 +291,7 @@  discard block
 block discarded – undo
291 291
      */
292 292
     public static function missingIdentifierField($className, $fieldName)
293 293
     {
294
-        return new self("The identifier $fieldName is missing for a query of " . $className);
294
+        return new self("The identifier $fieldName is missing for a query of ".$className);
295 295
     }
296 296
 
297 297
     /**
@@ -303,8 +303,8 @@  discard block
 block discarded – undo
303 303
     public static function unrecognizedIdentifierFields($className, $fieldNames)
304 304
     {
305 305
         return new self(
306
-            "Unrecognized identifier fields: '" . implode("', '", $fieldNames) . "' " .
307
-            "are not present on class '" . $className . "'."
306
+            "Unrecognized identifier fields: '".implode("', '", $fieldNames)."' ".
307
+            "are not present on class '".$className."'."
308 308
         );
309 309
     }
310 310
 
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Tools/ToolsException.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@
 block discarded – undo
36 36
      */
37 37
     public static function schemaToolFailure($sql, \Exception $e)
38 38
     {
39
-        return new self("Schema-Tool failed with Error '" . $e->getMessage() . "' while executing DDL: " . $sql, "0", $e);
39
+        return new self("Schema-Tool failed with Error '".$e->getMessage()."' while executing DDL: ".$sql, "0", $e);
40 40
     }
41 41
 
42 42
     /**
Please login to merge, or discard this patch.
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
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
     {
114 114
         $namespace = $this->getClassNamespace($fullClassName);
115 115
 
116
-        return $namespace ? 'namespace ' . $namespace . ';' : '';
116
+        return $namespace ? 'namespace '.$namespace.';' : '';
117 117
     }
118 118
 
119 119
     /**
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
         $repositoryName = $this->repositoryName ?: EntityRepository::class;
129 129
 
130 130
         if ($namespace && $repositoryName[0] !== '\\') {
131
-            $repositoryName = '\\' . $repositoryName;
131
+            $repositoryName = '\\'.$repositoryName;
132 132
         }
133 133
 
134 134
         return $repositoryName;
@@ -144,8 +144,8 @@  discard block
 block discarded – undo
144 144
     {
145 145
         $code = $this->generateEntityRepositoryClass($fullClassName);
146 146
 
147
-        $path = $outputDirectory . DIRECTORY_SEPARATOR
148
-              . str_replace('\\', \DIRECTORY_SEPARATOR, $fullClassName) . '.php';
147
+        $path = $outputDirectory.DIRECTORY_SEPARATOR
148
+              . str_replace('\\', \DIRECTORY_SEPARATOR, $fullClassName).'.php';
149 149
         $dir = dirname($path);
150 150
 
151 151
         if ( ! is_dir($dir)) {
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.