| @@ -147,9 +147,9 @@ | ||
| 147 | 147 | return (bool) $persister->count($criteria); | 
| 148 | 148 | } | 
| 149 | 149 | |
| 150 | - /** | |
| 151 | -     * {@inheritdoc} | |
| 152 | - */ | |
| 150 | + /** | |
| 151 | +         * {@inheritdoc} | |
| 152 | + */ | |
| 153 | 153 | public function contains(PersistentCollection $collection, $element) | 
| 154 | 154 |      { | 
| 155 | 155 |          if ( ! $this->isValidEntityState($element)) { | 
| @@ -339,8 +339,8 @@ discard block | ||
| 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 | ||
| 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 | ||
| 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 | ||
| 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 | ||
| 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'; | 
| @@ -47,17 +47,17 @@ | ||
| 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 | /** | 
| @@ -57,7 +57,7 @@ | ||
| 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 | |
| @@ -74,7 +74,7 @@ discard block | ||
| 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 | ||
| 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 | |
| @@ -70,8 +70,8 @@ discard block | ||
| 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 | ||
| 100 | 100 | ); | 
| 101 | 101 | |
| 102 | 102 | $sql .= $joinTableAlias . '.' . $joinColumn['name'] | 
| 103 | - . ' = ' | |
| 104 | - . $sourceTableAlias . '.' . $sourceColumnName; | |
| 103 | + . ' = ' | |
| 104 | + . $sourceTableAlias . '.' . $sourceColumnName; | |
| 105 | 105 | } | 
| 106 | 106 | } | 
| 107 | 107 | |
| @@ -138,8 +138,8 @@ | ||
| 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 | } | 
| @@ -212,10 +212,10 @@ | ||
| 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; | 
| @@ -45,9 +45,9 @@ discard block | ||
| 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 | ||
| 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)) { |