Completed
Pull Request — 2.6 (#8015)
by
unknown
06:46
created
lib/Doctrine/ORM/Mapping/Builder/FieldBuilder.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -275,7 +275,7 @@
 block discarded – undo
275 275
     {
276 276
         $cm = $this->builder->getClassMetadata();
277 277
         if ($this->generatedValue) {
278
-            $cm->setIdGeneratorType(constant('Doctrine\ORM\Mapping\ClassMetadata::GENERATOR_TYPE_' . $this->generatedValue));
278
+            $cm->setIdGeneratorType(constant('Doctrine\ORM\Mapping\ClassMetadata::GENERATOR_TYPE_'.$this->generatedValue));
279 279
         }
280 280
 
281 281
         if ($this->version) {
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Mapping/DefaultEntityListenerResolver.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@
 block discarded – undo
67 67
     public function resolve($className)
68 68
     {
69 69
         if (isset($this->instances[$className = trim($className, '\\')])) {
70
-           return $this->instances[$className];
70
+            return $this->instances[$className];
71 71
         }
72 72
 
73 73
         return $this->instances[$className] = new $className();
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Cache/Persister/Entity/AbstractEntityPersister.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -296,7 +296,7 @@
 block discarded – undo
296 296
             ? $this->persister->expandCriteriaParameters($criteria)
297 297
             : $this->persister->expandParameters($criteria);
298 298
 
299
-        return sha1($query . serialize($params) . serialize($orderBy) . $limit . $offset);
299
+        return sha1($query.serialize($params).serialize($orderBy).$limit.$offset);
300 300
     }
301 301
 
302 302
     /**
Please login to merge, or discard this patch.
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -41,9 +41,9 @@  discard block
 block discarded – undo
41 41
  */
42 42
 abstract class AbstractEntityPersister implements CachedEntityPersister
43 43
 {
44
-     /**
45
-     * @var \Doctrine\ORM\UnitOfWork
46
-     */
44
+        /**
45
+         * @var \Doctrine\ORM\UnitOfWork
46
+         */
47 47
     protected $uow;
48 48
 
49 49
     /**
@@ -61,9 +61,9 @@  discard block
 block discarded – undo
61 61
      */
62 62
     protected $class;
63 63
 
64
-     /**
65
-     * @var array
66
-     */
64
+        /**
65
+         * @var array
66
+         */
67 67
     protected $queuedCache = [];
68 68
 
69 69
     /**
Please login to merge, or discard this patch.
lib/Doctrine/ORM/EntityRepository.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -301,14 +301,14 @@
 block discarded – undo
301 301
      */
302 302
     private function resolveMagicCall($method, $by, array $arguments)
303 303
     {
304
-        if (! $arguments) {
305
-            throw ORMException::findByRequiresParameter($method . $by);
304
+        if ( ! $arguments) {
305
+            throw ORMException::findByRequiresParameter($method.$by);
306 306
         }
307 307
 
308 308
         $fieldName = lcfirst(Inflector::classify($by));
309 309
 
310
-        if (! ($this->_class->hasField($fieldName) || $this->_class->hasAssociation($fieldName))) {
311
-            throw ORMException::invalidMagicCall($this->_entityName, $fieldName, $method . $by);
310
+        if ( ! ($this->_class->hasField($fieldName) || $this->_class->hasAssociation($fieldName))) {
311
+            throw ORMException::invalidMagicCall($this->_entityName, $fieldName, $method.$by);
312 312
         }
313 313
 
314 314
         return $this->$method([$fieldName => $arguments[0]], ...array_slice($arguments, 1));
Please login to merge, or discard this patch.
tools/sandbox/bootstrap.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -5,8 +5,8 @@  discard block
 block discarded – undo
5 5
 
6 6
 // Path to composer autoloader. You can use different provided by your favorite framework,
7 7
 // if you want to.
8
-$loaderPath = __DIR__ . '/../../vendor/autoload.php';
9
-if(!is_readable($loaderPath)){
8
+$loaderPath = __DIR__.'/../../vendor/autoload.php';
9
+if ( ! is_readable($loaderPath)) {
10 10
     throw new LogicException('Run php composer.phar install at first');
11 11
 }
12 12
 $loader = require $loaderPath;
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 $config = new \Doctrine\ORM\Configuration();
20 20
 
21 21
 // Set up Metadata Drivers
22
-$driverImpl = $config->newDefaultAnnotationDriver([__DIR__ . "/Entities"]);
22
+$driverImpl = $config->newDefaultAnnotationDriver([__DIR__."/Entities"]);
23 23
 $config->setMetadataDriverImpl($driverImpl);
24 24
 
25 25
 // Set up caches, depending on $debug variable.
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 $config->setQueryCacheImpl($cache);
30 30
 
31 31
 // Proxy configuration
32
-$config->setProxyDir(__DIR__ . '/Proxies');
32
+$config->setProxyDir(__DIR__.'/Proxies');
33 33
 $config->setProxyNamespace('Proxies');
34 34
 
35 35
 // Database connection information
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Query/AST/Functions/ConcatFunction.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@
 block discarded – undo
53 53
             $args[] = $sqlWalker->walkStringPrimary($expression);
54 54
         }
55 55
 
56
-        return call_user_func_array([$platform,'getConcatExpression'], $args);
56
+        return call_user_func_array([$platform, 'getConcatExpression'], $args);
57 57
     }
58 58
 
59 59
     /**
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Id/TableGenerator.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -92,7 +92,7 @@
 block discarded – undo
92 92
                         $this->_tableName, $this->_sequenceName, $this->_allocationSize
93 93
                     );
94 94
 
95
-                    if ($conn->executeUpdate($updateSql, [1 => $currentLevel, 2 => $currentLevel+1]) !== 1) {
95
+                    if ($conn->executeUpdate($updateSql, [1 => $currentLevel, 2 => $currentLevel + 1]) !== 1) {
96 96
                         // no affected rows, concurrency issue, throw exception
97 97
                     }
98 98
                 } else {
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Persisters/SqlValueVisitor.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@
 block discarded – undo
39 39
     /**
40 40
      * @var array
41 41
      */
42
-    private $types  = [];
42
+    private $types = [];
43 43
 
44 44
     /**
45 45
      * Converts a comparison expression into the target query language output.
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Query/Exec/MultiTableUpdateExecutor.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -88,8 +88,8 @@  discard block
 block discarded – undo
88 88
         // 1. Create an INSERT INTO temptable ... SELECT identifiers WHERE $AST->getWhereClause()
89 89
         $sqlWalker->setSQLTableAlias($primaryClass->getTableName(), 't0', $updateClause->aliasIdentificationVariable);
90 90
 
91
-        $this->_insertSql = 'INSERT INTO ' . $tempTable . ' (' . $idColumnList . ')'
92
-                . ' SELECT t0.' . implode(', t0.', $idColumnNames);
91
+        $this->_insertSql = 'INSERT INTO '.$tempTable.' ('.$idColumnList.')'
92
+                . ' SELECT t0.'.implode(', t0.', $idColumnNames);
93 93
 
94 94
         $rangeDecl = new AST\RangeVariableDeclaration($primaryClass->name, $updateClause->aliasIdentificationVariable);
95 95
         $fromClause = new AST\FromClause([new AST\IdentificationVariableDeclaration($rangeDecl, null, [])]);
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
         $this->_insertSql .= $sqlWalker->walkFromClause($fromClause);
98 98
 
99 99
         // 2. Create ID subselect statement used in UPDATE ... WHERE ... IN (subselect)
100
-        $idSubselect = 'SELECT ' . $idColumnList . ' FROM ' . $tempTable;
100
+        $idSubselect = 'SELECT '.$idColumnList.' FROM '.$tempTable;
101 101
 
102 102
         // 3. Create and store UPDATE statements
103 103
         $classNames = array_merge($primaryClass->parentClasses, [$primaryClass->name], $primaryClass->subClasses);
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
         foreach (array_reverse($classNames) as $className) {
107 107
             $affected = false;
108 108
             $class = $em->getClassMetadata($className);
109
-            $updateSql = 'UPDATE ' . $quoteStrategy->getTableName($class, $platform) . ' SET ';
109
+            $updateSql = 'UPDATE '.$quoteStrategy->getTableName($class, $platform).' SET ';
110 110
 
111 111
             foreach ($updateItems as $updateItem) {
112 112
                 $field = $updateItem->pathExpression->field;
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
             }
134 134
 
135 135
             if ($affected) {
136
-                $this->_sqlStatements[$i] = $updateSql . ' WHERE (' . $idColumnList . ') IN (' . $idSubselect . ')';
136
+                $this->_sqlStatements[$i] = $updateSql.' WHERE ('.$idColumnList.') IN ('.$idSubselect.')';
137 137
             }
138 138
         }
139 139
 
@@ -152,8 +152,8 @@  discard block
 block discarded – undo
152 152
             ];
153 153
         }
154 154
 
155
-        $this->_createTempTableSql = $platform->getCreateTemporaryTableSnippetSQL() . ' ' . $tempTable . ' ('
156
-                . $platform->getColumnDeclarationListSQL($columnDefinitions) . ')';
155
+        $this->_createTempTableSql = $platform->getCreateTemporaryTableSnippetSQL().' '.$tempTable.' ('
156
+                . $platform->getColumnDeclarationListSQL($columnDefinitions).')';
157 157
 
158 158
         $this->_dropTempTableSql = $platform->getDropTemporaryTableSQL($tempTable);
159 159
     }
Please login to merge, or discard this patch.