@@ -105,6 +105,6 @@ |
||
| 105 | 105 | */ |
| 106 | 106 | public function valid() |
| 107 | 107 | { |
| 108 | - return ($this->_current!=false); |
|
| 108 | + return ($this->_current != false); |
|
| 109 | 109 | } |
| 110 | 110 | } |
@@ -715,9 +715,9 @@ |
||
| 715 | 715 | ); |
| 716 | 716 | } |
| 717 | 717 | |
| 718 | - /** |
|
| 719 | - * {@inheritdoc} |
|
| 720 | - */ |
|
| 718 | + /** |
|
| 719 | + * {@inheritdoc} |
|
| 720 | + */ |
|
| 721 | 721 | protected function getHash() |
| 722 | 722 | { |
| 723 | 723 | return sha1(parent::getHash(). '-'. $this->_firstResult . '-' . $this->_maxResults); |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | /** |
| 43 | 43 | * A query object is in CLEAN state when it has NO unparsed/unprocessed DQL parts. |
| 44 | 44 | */ |
| 45 | - const STATE_CLEAN = 1; |
|
| 45 | + const STATE_CLEAN = 1; |
|
| 46 | 46 | |
| 47 | 47 | /** |
| 48 | 48 | * A query object is in state DIRTY when it has DQL parts that have not yet been |
@@ -738,11 +738,11 @@ discard block |
||
| 738 | 738 | ->getName(); |
| 739 | 739 | |
| 740 | 740 | return md5( |
| 741 | - $this->getDQL() . serialize($this->_hints) . |
|
| 742 | - '&platform=' . $platform . |
|
| 743 | - ($this->_em->hasFilters() ? $this->_em->getFilters()->getHash() : '') . |
|
| 744 | - '&firstResult=' . $this->_firstResult . '&maxResult=' . $this->_maxResults . |
|
| 745 | - '&hydrationMode=' . $this->_hydrationMode . '&types=' . serialize($this->_parsedTypes) . 'DOCTRINE_QUERY_CACHE_SALT' |
|
| 741 | + $this->getDQL().serialize($this->_hints). |
|
| 742 | + '&platform='.$platform. |
|
| 743 | + ($this->_em->hasFilters() ? $this->_em->getFilters()->getHash() : ''). |
|
| 744 | + '&firstResult='.$this->_firstResult.'&maxResult='.$this->_maxResults. |
|
| 745 | + '&hydrationMode='.$this->_hydrationMode.'&types='.serialize($this->_parsedTypes).'DOCTRINE_QUERY_CACHE_SALT' |
|
| 746 | 746 | ); |
| 747 | 747 | } |
| 748 | 748 | |
@@ -751,7 +751,7 @@ discard block |
||
| 751 | 751 | */ |
| 752 | 752 | protected function getHash() |
| 753 | 753 | { |
| 754 | - return sha1(parent::getHash(). '-'. $this->_firstResult . '-' . $this->_maxResults); |
|
| 754 | + return sha1(parent::getHash().'-'.$this->_firstResult.'-'.$this->_maxResults); |
|
| 755 | 755 | } |
| 756 | 756 | |
| 757 | 757 | /** |
@@ -91,6 +91,6 @@ |
||
| 91 | 91 | */ |
| 92 | 92 | public function getColumnAlias($columnName, $counter, AbstractPlatform $platform, ClassMetadata $class = null) |
| 93 | 93 | { |
| 94 | - return $platform->getSQLResultCasing($columnName . '_' . $counter); |
|
| 94 | + return $platform->getSQLResultCasing($columnName.'_'.$counter); |
|
| 95 | 95 | } |
| 96 | 96 | } |
@@ -175,7 +175,7 @@ discard block |
||
| 175 | 175 | $this->reverseEngineerMappingFromDatabase(); |
| 176 | 176 | |
| 177 | 177 | if ( ! isset($this->classToTableNames[$className])) { |
| 178 | - throw new \InvalidArgumentException("Unknown class " . $className); |
|
| 178 | + throw new \InvalidArgumentException("Unknown class ".$className); |
|
| 179 | 179 | } |
| 180 | 180 | |
| 181 | 181 | $tableName = $this->classToTableNames[$className]; |
@@ -286,7 +286,7 @@ discard block |
||
| 286 | 286 | |
| 287 | 287 | if ( ! $table->hasPrimaryKey()) { |
| 288 | 288 | throw new MappingException( |
| 289 | - "Table " . $table->getName() . " has no primary key. Doctrine does not ". |
|
| 289 | + "Table ".$table->getName()." has no primary key. Doctrine does not ". |
|
| 290 | 290 | "support reverse engineering from tables that don't have a primary key." |
| 291 | 291 | ); |
| 292 | 292 | } |
@@ -407,7 +407,7 @@ discard block |
||
| 407 | 407 | case Type::STRING: |
| 408 | 408 | case Type::TEXT: |
| 409 | 409 | $fieldMapping['length'] = $column->getLength(); |
| 410 | - $fieldMapping['options']['fixed'] = $column->getFixed(); |
|
| 410 | + $fieldMapping['options']['fixed'] = $column->getFixed(); |
|
| 411 | 411 | break; |
| 412 | 412 | |
| 413 | 413 | case Type::DECIMAL: |
@@ -523,10 +523,10 @@ discard block |
||
| 523 | 523 | private function getClassNameForTable($tableName) |
| 524 | 524 | { |
| 525 | 525 | if (isset($this->classNamesForTables[$tableName])) { |
| 526 | - return $this->namespace . $this->classNamesForTables[$tableName]; |
|
| 526 | + return $this->namespace.$this->classNamesForTables[$tableName]; |
|
| 527 | 527 | } |
| 528 | 528 | |
| 529 | - return $this->namespace . Inflector::classify(strtolower($tableName)); |
|
| 529 | + return $this->namespace.Inflector::classify(strtolower($tableName)); |
|
| 530 | 530 | } |
| 531 | 531 | |
| 532 | 532 | /** |
@@ -71,7 +71,7 @@ discard block |
||
| 71 | 71 | */ |
| 72 | 72 | public function joinColumnName($propertyName, $className = null) |
| 73 | 73 | { |
| 74 | - return $propertyName . '_' . $this->referenceColumnName(); |
|
| 74 | + return $propertyName.'_'.$this->referenceColumnName(); |
|
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | /** |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | */ |
| 80 | 80 | public function joinTableName($sourceEntity, $targetEntity, $propertyName = null) |
| 81 | 81 | { |
| 82 | - return strtolower($this->classToTableName($sourceEntity) . '_' . |
|
| 82 | + return strtolower($this->classToTableName($sourceEntity).'_'. |
|
| 83 | 83 | $this->classToTableName($targetEntity)); |
| 84 | 84 | } |
| 85 | 85 | |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | */ |
| 89 | 89 | public function joinKeyColumnName($entityName, $referencedColumnName = null) |
| 90 | 90 | { |
| 91 | - return strtolower($this->classToTableName($entityName) . '_' . |
|
| 91 | + return strtolower($this->classToTableName($entityName).'_'. |
|
| 92 | 92 | ($referencedColumnName ?: $this->referenceColumnName())); |
| 93 | 93 | } |
| 94 | 94 | } |
@@ -155,9 +155,9 @@ |
||
| 155 | 155 | } |
| 156 | 156 | |
| 157 | 157 | if ($property->isProtected()) { |
| 158 | - return "\0*\0" . $propertyName; |
|
| 158 | + return "\0*\0".$propertyName; |
|
| 159 | 159 | } |
| 160 | 160 | |
| 161 | - return "\0" . $property->getDeclaringClass()->getName() . "\0" . $propertyName; |
|
| 161 | + return "\0".$property->getDeclaringClass()->getName()."\0".$propertyName; |
|
| 162 | 162 | } |
| 163 | 163 | } |
@@ -275,7 +275,7 @@ |
||
| 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) { |
@@ -67,7 +67,7 @@ |
||
| 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(); |
@@ -296,7 +296,7 @@ |
||
| 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 | /** |
@@ -41,9 +41,9 @@ discard block |
||
| 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 |
||
| 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 | /** |