Completed
Pull Request — master (#5938)
by Maximilian
16:49 queued 08:43
created
lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php 1 patch
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -339,8 +339,8 @@  discard block
 block discarded – undo
339 339
 
340 340
         // FIXME: Order with composite keys might not be correct
341 341
         $sql = 'SELECT ' . $columnName
342
-             . ' FROM '  . $tableName
343
-             . ' WHERE ' . implode(' = ? AND ', $identifier) . ' = ?';
342
+                . ' FROM '  . $tableName
343
+                . ' WHERE ' . implode(' = ? AND ', $identifier) . ' = ?';
344 344
 
345 345
         $flatId = $this->identifierFlattener->flattenIdentifier($versionedClass, $id);
346 346
 
@@ -474,8 +474,8 @@  discard block
 block discarded – undo
474 474
         }
475 475
 
476 476
         $sql = 'UPDATE ' . $quotedTableName
477
-             . ' SET ' . implode(', ', $set)
478
-             . ' WHERE ' . implode(' = ? AND ', $where) . ' = ?';
477
+                . ' SET ' . implode(', ', $set)
478
+                . ' WHERE ' . implode(' = ? AND ', $where) . ' = ?';
479 479
 
480 480
         $result = $this->conn->executeUpdate($sql, $params, $types);
481 481
 
@@ -1528,9 +1528,9 @@  discard block
 block discarded – undo
1528 1528
         $lock  = $this->getLockTablesSql($lockMode);
1529 1529
         $where = ($conditionSql ? ' WHERE ' . $conditionSql : '') . ' ';
1530 1530
         $sql = 'SELECT 1 '
1531
-             . $lock
1532
-             . $where
1533
-             . $lockSql;
1531
+                . $lock
1532
+                . $where
1533
+                . $lockSql;
1534 1534
 
1535 1535
         list($params, $types) = $this->expandParameters($criteria);
1536 1536
 
@@ -1981,8 +1981,8 @@  discard block
 block discarded – undo
1981 1981
         $alias = $this->getSQLTableAlias($this->class->name);
1982 1982
 
1983 1983
         $sql = 'SELECT 1 '
1984
-             . $this->getLockTablesSql(null)
1985
-             . ' WHERE ' . $this->getSelectConditionSQL($criteria);
1984
+                . $this->getLockTablesSql(null)
1985
+                . ' WHERE ' . $this->getSelectConditionSQL($criteria);
1986 1986
 
1987 1987
         list($params, $types) = $this->expandParameters($criteria);
1988 1988
 
@@ -2012,9 +2012,9 @@  discard block
 block discarded – undo
2012 2012
     {
2013 2013
         // if one of the join columns is nullable, return left join
2014 2014
         foreach ($joinColumns as $joinColumn) {
2015
-             if ( ! isset($joinColumn['nullable']) || $joinColumn['nullable']) {
2016
-                 return 'LEFT JOIN';
2017
-             }
2015
+                if ( ! isset($joinColumn['nullable']) || $joinColumn['nullable']) {
2016
+                    return 'LEFT JOIN';
2017
+                }
2018 2018
         }
2019 2019
 
2020 2020
         return 'INNER JOIN';
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Persisters/Entity/EntityPersister.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -47,17 +47,17 @@
 block discarded – undo
47 47
      * Get all queued inserts.
48 48
      *
49 49
      * @return array
50
-    */
50
+     */
51 51
     public function getInserts();
52 52
 
53
-     /**
54
-     * @TODO - It should not be here.
55
-     * But its necessary since JoinedSubclassPersister#executeInserts invoke the root persister.
56
-     *
57
-     * Gets the INSERT SQL used by the persister to persist a new entity.
58
-     *
59
-     * @return string
60
-     */
53
+        /**
54
+         * @TODO - It should not be here.
55
+         * But its necessary since JoinedSubclassPersister#executeInserts invoke the root persister.
56
+         *
57
+         * Gets the INSERT SQL used by the persister to persist a new entity.
58
+         *
59
+         * @return string
60
+         */
61 61
     public function getInsertSQL();
62 62
 
63 63
     /**
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Persisters/Entity/SingleTablePersister.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -57,7 +57,7 @@
 block discarded – undo
57 57
         $rootClass  = $this->em->getClassMetadata($this->class->rootEntityName);
58 58
         $tableAlias = $this->getSQLTableAlias($rootClass->name);
59 59
 
60
-         // Append discriminator column
60
+            // Append discriminator column
61 61
         $discrColumn     = $this->class->discriminatorColumn['name'];
62 62
         $discrColumnType = $this->class->discriminatorColumn['type'];
63 63
 
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Query/AST/Node.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
             foreach ($props as $name => $prop) {
75 75
                 $ident += 4;
76 76
                 $str .= str_repeat(' ', $ident) . '"' . $name . '": '
77
-                      . $this->dump($prop) . ',' . PHP_EOL;
77
+                        . $this->dump($prop) . ',' . PHP_EOL;
78 78
                 $ident -= 4;
79 79
             }
80 80
 
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
 
87 87
             foreach ($obj as $k => $v) {
88 88
                 $str .= PHP_EOL . str_repeat(' ', $ident) . '"'
89
-                      . $k . '" => ' . $this->dump($v) . ',';
89
+                        . $k . '" => ' . $this->dump($v) . ',';
90 90
                 $some = true;
91 91
             }
92 92
 
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Query/AST/Functions/SizeFunction.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -70,8 +70,8 @@  discard block
 block discarded – undo
70 70
                 if ($first) $first = false; else $sql .= ' AND ';
71 71
 
72 72
                 $sql .= $targetTableAlias . '.' . $sourceColumn
73
-                      . ' = '
74
-                      . $sourceTableAlias . '.' . $quoteStrategy->getColumnName($class->fieldNames[$targetColumn], $class, $platform);
73
+                        . ' = '
74
+                        . $sourceTableAlias . '.' . $quoteStrategy->getColumnName($class->fieldNames[$targetColumn], $class, $platform);
75 75
             }
76 76
         } else { // many-to-many
77 77
             $targetClass = $sqlWalker->getEntityManager()->getClassMetadata($assoc['targetEntity']);
@@ -100,8 +100,8 @@  discard block
 block discarded – undo
100 100
                 );
101 101
 
102 102
                 $sql .= $joinTableAlias . '.' . $joinColumn['name']
103
-                      . ' = '
104
-                      . $sourceTableAlias . '.' . $sourceColumnName;
103
+                        . ' = '
104
+                        . $sourceTableAlias . '.' . $sourceColumnName;
105 105
             }
106 106
         }
107 107
 
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Query/Expr/Join.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -138,8 +138,8 @@
 block discarded – undo
138 138
     public function __toString()
139 139
     {
140 140
         return strtoupper($this->joinType) . ' JOIN ' . $this->join
141
-             . ($this->alias ? ' ' . $this->alias : '')
142
-             . ($this->indexBy ? ' INDEX BY ' . $this->indexBy : '')
143
-             . ($this->condition ? ' ' . strtoupper($this->conditionType) . ' ' . $this->condition : '');
141
+                . ($this->alias ? ' ' . $this->alias : '')
142
+                . ($this->indexBy ? ' INDEX BY ' . $this->indexBy : '')
143
+                . ($this->condition ? ' ' . strtoupper($this->conditionType) . ' ' . $this->condition : '');
144 144
     }
145 145
 }
Please login to merge, or discard this patch.
lib/Doctrine/ORM/QueryBuilder.php 1 patch
Indentation   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -118,11 +118,11 @@  discard block
 block discarded – undo
118 118
      */
119 119
     private $joinRootAliases = array();
120 120
 
121
-     /**
122
-     * Whether to use second level cache, if available.
123
-     *
124
-     * @var boolean
125
-     */
121
+        /**
122
+         * Whether to use second level cache, if available.
123
+         *
124
+         * @var boolean
125
+         */
126 126
     protected $cacheable = false;
127 127
 
128 128
     /**
@@ -213,10 +213,10 @@  discard block
 block discarded – undo
213 213
     }
214 214
 
215 215
     /**
216
-    * Obtain the name of the second level query cache region in which query results will be stored
217
-    *
218
-    * @return string|null The cache region name; NULL indicates the default region.
219
-    */
216
+     * Obtain the name of the second level query cache region in which query results will be stored
217
+     *
218
+     * @return string|null The cache region name; NULL indicates the default region.
219
+     */
220 220
     public function getCacheRegion()
221 221
     {
222 222
         return $this->cacheRegion;
@@ -1372,10 +1372,10 @@  discard block
 block discarded – undo
1372 1372
      */
1373 1373
     private function _getDQLForDelete()
1374 1374
     {
1375
-         return 'DELETE'
1376
-              . $this->_getReducedDQLQueryPart('from', array('pre' => ' ', 'separator' => ', '))
1377
-              . $this->_getReducedDQLQueryPart('where', array('pre' => ' WHERE '))
1378
-              . $this->_getReducedDQLQueryPart('orderBy', array('pre' => ' ORDER BY ', 'separator' => ', '));
1375
+            return 'DELETE'
1376
+                . $this->_getReducedDQLQueryPart('from', array('pre' => ' ', 'separator' => ', '))
1377
+                . $this->_getReducedDQLQueryPart('where', array('pre' => ' WHERE '))
1378
+                . $this->_getReducedDQLQueryPart('orderBy', array('pre' => ' ORDER BY ', 'separator' => ', '));
1379 1379
     }
1380 1380
 
1381 1381
     /**
@@ -1383,11 +1383,11 @@  discard block
 block discarded – undo
1383 1383
      */
1384 1384
     private function _getDQLForUpdate()
1385 1385
     {
1386
-         return 'UPDATE'
1387
-              . $this->_getReducedDQLQueryPart('from', array('pre' => ' ', 'separator' => ', '))
1388
-              . $this->_getReducedDQLQueryPart('set', array('pre' => ' SET ', 'separator' => ', '))
1389
-              . $this->_getReducedDQLQueryPart('where', array('pre' => ' WHERE '))
1390
-              . $this->_getReducedDQLQueryPart('orderBy', array('pre' => ' ORDER BY ', 'separator' => ', '));
1386
+            return 'UPDATE'
1387
+                . $this->_getReducedDQLQueryPart('from', array('pre' => ' ', 'separator' => ', '))
1388
+                . $this->_getReducedDQLQueryPart('set', array('pre' => ' SET ', 'separator' => ', '))
1389
+                . $this->_getReducedDQLQueryPart('where', array('pre' => ' WHERE '))
1390
+                . $this->_getReducedDQLQueryPart('orderBy', array('pre' => ' ORDER BY ', 'separator' => ', '));
1391 1391
     }
1392 1392
 
1393 1393
     /**
@@ -1396,8 +1396,8 @@  discard block
 block discarded – undo
1396 1396
     private function _getDQLForSelect()
1397 1397
     {
1398 1398
         $dql = 'SELECT'
1399
-             . ($this->_dqlParts['distinct']===true ? ' DISTINCT' : '')
1400
-             . $this->_getReducedDQLQueryPart('select', array('pre' => ' ', 'separator' => ', '));
1399
+                . ($this->_dqlParts['distinct']===true ? ' DISTINCT' : '')
1400
+                . $this->_getReducedDQLQueryPart('select', array('pre' => ' ', 'separator' => ', '));
1401 1401
 
1402 1402
         $fromParts   = $this->getDQLPart('from');
1403 1403
         $joinParts   = $this->getDQLPart('join');
@@ -1421,10 +1421,10 @@  discard block
 block discarded – undo
1421 1421
         }
1422 1422
 
1423 1423
         $dql .= implode(', ', $fromClauses)
1424
-              . $this->_getReducedDQLQueryPart('where', array('pre' => ' WHERE '))
1425
-              . $this->_getReducedDQLQueryPart('groupBy', array('pre' => ' GROUP BY ', 'separator' => ', '))
1426
-              . $this->_getReducedDQLQueryPart('having', array('pre' => ' HAVING '))
1427
-              . $this->_getReducedDQLQueryPart('orderBy', array('pre' => ' ORDER BY ', 'separator' => ', '));
1424
+                . $this->_getReducedDQLQueryPart('where', array('pre' => ' WHERE '))
1425
+                . $this->_getReducedDQLQueryPart('groupBy', array('pre' => ' GROUP BY ', 'separator' => ', '))
1426
+                . $this->_getReducedDQLQueryPart('having', array('pre' => ' HAVING '))
1427
+                . $this->_getReducedDQLQueryPart('orderBy', array('pre' => ' ORDER BY ', 'separator' => ', '));
1428 1428
 
1429 1429
         return $dql;
1430 1430
     }
@@ -1444,8 +1444,8 @@  discard block
 block discarded – undo
1444 1444
         }
1445 1445
 
1446 1446
         return (isset($options['pre']) ? $options['pre'] : '')
1447
-             . (is_array($queryPart) ? implode($options['separator'], $queryPart) : $queryPart)
1448
-             . (isset($options['post']) ? $options['post'] : '');
1447
+                . (is_array($queryPart) ? implode($options['separator'], $queryPart) : $queryPart)
1448
+                . (isset($options['post']) ? $options['post'] : '');
1449 1449
     }
1450 1450
 
1451 1451
     /**
Please login to merge, or discard this patch.
lib/Doctrine/ORM/AbstractQuery.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -212,10 +212,10 @@
 block discarded – undo
212 212
     }
213 213
 
214 214
     /**
215
-    * Obtain the name of the second level query cache region in which query results will be stored
216
-    *
217
-    * @return string|null The cache region name; NULL indicates the default region.
218
-    */
215
+     * Obtain the name of the second level query cache region in which query results will be stored
216
+     *
217
+     * @return string|null The cache region name; NULL indicates the default region.
218
+     */
219 219
     public function getCacheRegion()
220 220
     {
221 221
         return $this->cacheRegion;
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Cache/DefaultCache.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -45,9 +45,9 @@  discard block
 block discarded – undo
45 45
      */
46 46
     private $uow;
47 47
 
48
-     /**
49
-     * @var \Doctrine\ORM\Cache\CacheFactory
50
-     */
48
+        /**
49
+         * @var \Doctrine\ORM\Cache\CacheFactory
50
+         */
51 51
     private $cacheFactory;
52 52
 
53 53
     /**
@@ -289,12 +289,12 @@  discard block
 block discarded – undo
289 289
         return $this->queryCaches[$regionName];
290 290
     }
291 291
 
292
-     /**
293
-     * @param \Doctrine\ORM\Mapping\ClassMetadata $metadata   The entity metadata.
294
-     * @param mixed                               $identifier The entity identifier.
295
-     *
296
-     * @return \Doctrine\ORM\Cache\EntityCacheKey
297
-     */
292
+        /**
293
+         * @param \Doctrine\ORM\Mapping\ClassMetadata $metadata   The entity metadata.
294
+         * @param mixed                               $identifier The entity identifier.
295
+         *
296
+         * @return \Doctrine\ORM\Cache\EntityCacheKey
297
+         */
298 298
     private function buildEntityCacheKey(ClassMetadata $metadata, $identifier)
299 299
     {
300 300
         if ( ! is_array($identifier)) {
Please login to merge, or discard this patch.