@@ -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 | } |
@@ -49,10 +49,10 @@ discard block |
||
| 49 | 49 | $tableName = $class->table['name']; |
| 50 | 50 | |
| 51 | 51 | if ( ! empty($class->table['schema'])) { |
| 52 | - $tableName = $class->table['schema'] . '.' . $class->table['name']; |
|
| 52 | + $tableName = $class->table['schema'].'.'.$class->table['name']; |
|
| 53 | 53 | |
| 54 | 54 | if ( ! $platform->supportsSchemas() && $platform->canEmulateSchemas()) { |
| 55 | - $tableName = $class->table['schema'] . '__' . $class->table['name']; |
|
| 55 | + $tableName = $class->table['schema'].'__'.$class->table['name']; |
|
| 56 | 56 | } |
| 57 | 57 | } |
| 58 | 58 | |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | $schema = ''; |
| 100 | 100 | |
| 101 | 101 | if (isset($association['joinTable']['schema'])) { |
| 102 | - $schema = $association['joinTable']['schema'] . '.'; |
|
| 102 | + $schema = $association['joinTable']['schema'].'.'; |
|
| 103 | 103 | } |
| 104 | 104 | |
| 105 | 105 | $tableName = $association['joinTable']['name']; |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | $tableName = $platform->quoteIdentifier($tableName); |
| 109 | 109 | } |
| 110 | 110 | |
| 111 | - return $schema . $tableName; |
|
| 111 | + return $schema.$tableName; |
|
| 112 | 112 | } |
| 113 | 113 | |
| 114 | 114 | /** |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | // Association defined as Id field |
| 129 | 129 | $joinColumns = $class->associationMappings[$fieldName]['joinColumns']; |
| 130 | 130 | $assocQuotedColumnNames = array_map( |
| 131 | - function ($joinColumn) use ($platform) |
|
| 131 | + function($joinColumn) use ($platform) |
|
| 132 | 132 | { |
| 133 | 133 | return isset($joinColumn['quoted']) |
| 134 | 134 | ? $platform->quoteIdentifier($joinColumn['name']) |
@@ -153,10 +153,10 @@ discard block |
||
| 153 | 153 | // If the alias is to long, characters are cut off from the beginning. |
| 154 | 154 | // 3 ) Strip non alphanumeric characters |
| 155 | 155 | // 4 ) Prefix with "_" if the result its numeric |
| 156 | - $columnName = $columnName . '_' . $counter; |
|
| 156 | + $columnName = $columnName.'_'.$counter; |
|
| 157 | 157 | $columnName = substr($columnName, -$platform->getMaxIdentifierLength()); |
| 158 | 158 | $columnName = preg_replace('/[^A-Za-z0-9_]/', '', $columnName); |
| 159 | - $columnName = is_numeric($columnName) ? '_' . $columnName : $columnName; |
|
| 159 | + $columnName = is_numeric($columnName) ? '_'.$columnName : $columnName; |
|
| 160 | 160 | |
| 161 | 161 | return $platform->getSQLResultCasing($columnName); |
| 162 | 162 | } |
@@ -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 | /** |
@@ -301,14 +301,14 @@ |
||
| 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)); |