@@ -122,7 +122,7 @@ |
||
| 122 | 122 | $force = true === $input->getOption('force'); |
| 123 | 123 | |
| 124 | 124 | if ($dumpSql) { |
| 125 | - $output->writeln(implode(';' . PHP_EOL, $sqls) . ';'); |
|
| 125 | + $output->writeln(implode(';'.PHP_EOL, $sqls).';'); |
|
| 126 | 126 | } |
| 127 | 127 | |
| 128 | 128 | if ($force) { |
@@ -220,7 +220,7 @@ |
||
| 220 | 220 | $exporter->setMetadata($metadata); |
| 221 | 221 | $exporter->export(); |
| 222 | 222 | |
| 223 | - $output->writeln(PHP_EOL . sprintf( |
|
| 223 | + $output->writeln(PHP_EOL.sprintf( |
|
| 224 | 224 | 'Converting Doctrine 1.X schema to "<info>%s</info>" mapping type in "<info>%s</info>"', $toType, $destPath |
| 225 | 225 | )); |
| 226 | 226 | } else { |
@@ -71,7 +71,7 @@ |
||
| 71 | 71 | $em->getConnection()->connect(); |
| 72 | 72 | } |
| 73 | 73 | } catch (\Exception $e) { |
| 74 | - $output->writeln('<error>' . $e->getMessage() . '</error>'); |
|
| 74 | + $output->writeln('<error>'.$e->getMessage().'</error>'); |
|
| 75 | 75 | |
| 76 | 76 | return 1; |
| 77 | 77 | } |
@@ -242,17 +242,17 @@ |
||
| 242 | 242 | public function getUnitOfWork(); |
| 243 | 243 | |
| 244 | 244 | /** |
| 245 | - * Gets a hydrator for the given hydration mode. |
|
| 246 | - * |
|
| 247 | - * This method caches the hydrator instances which is used for all queries that don't |
|
| 248 | - * selectively iterate over the result. |
|
| 249 | - * |
|
| 250 | - * @deprecated |
|
| 251 | - * |
|
| 252 | - * @param int $hydrationMode |
|
| 253 | - * |
|
| 254 | - * @return \Doctrine\ORM\Internal\Hydration\AbstractHydrator |
|
| 255 | - */ |
|
| 245 | + * Gets a hydrator for the given hydration mode. |
|
| 246 | + * |
|
| 247 | + * This method caches the hydrator instances which is used for all queries that don't |
|
| 248 | + * selectively iterate over the result. |
|
| 249 | + * |
|
| 250 | + * @deprecated |
|
| 251 | + * |
|
| 252 | + * @param int $hydrationMode |
|
| 253 | + * |
|
| 254 | + * @return \Doctrine\ORM\Internal\Hydration\AbstractHydrator |
|
| 255 | + */ |
|
| 256 | 256 | public function getHydrator($hydrationMode); |
| 257 | 257 | |
| 258 | 258 | /** |
@@ -48,9 +48,9 @@ |
||
| 48 | 48 | */ |
| 49 | 49 | public static function emptyDiscriminatorValue($dqlAlias) |
| 50 | 50 | { |
| 51 | - return new self("The DQL alias '" . $dqlAlias . "' contains an entity ". |
|
| 52 | - "of an inheritance hierarchy with an empty discriminator value. This means " . |
|
| 53 | - "that the database contains inconsistent data with an empty " . |
|
| 51 | + return new self("The DQL alias '".$dqlAlias."' contains an entity ". |
|
| 52 | + "of an inheritance hierarchy with an empty discriminator value. This means ". |
|
| 53 | + "that the database contains inconsistent data with an empty ". |
|
| 54 | 54 | "discriminator value in a table row." |
| 55 | 55 | ); |
| 56 | 56 | } |
@@ -299,7 +299,7 @@ discard block |
||
| 299 | 299 | : $value; |
| 300 | 300 | |
| 301 | 301 | if ($cacheKeyInfo['isIdentifier'] && $value !== null) { |
| 302 | - $id[$dqlAlias] .= '|' . $value; |
|
| 302 | + $id[$dqlAlias] .= '|'.$value; |
|
| 303 | 303 | $nonemptyComponents[$dqlAlias] = true; |
| 304 | 304 | } |
| 305 | 305 | break; |
@@ -337,7 +337,7 @@ discard block |
||
| 337 | 337 | if ( ! isset($cacheKeyInfo['isScalar'])) { |
| 338 | 338 | $dqlAlias = $cacheKeyInfo['dqlAlias']; |
| 339 | 339 | $type = $cacheKeyInfo['type']; |
| 340 | - $fieldName = $dqlAlias . '_' . $fieldName; |
|
| 340 | + $fieldName = $dqlAlias.'_'.$fieldName; |
|
| 341 | 341 | $value = $type |
| 342 | 342 | ? $type->convertToPHPValue($value, $this->_platform) |
| 343 | 343 | : $value; |
@@ -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); |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | /** |
| 41 | 41 | * A query object is in CLEAN state when it has NO unparsed/unprocessed DQL parts. |
| 42 | 42 | */ |
| 43 | - const STATE_CLEAN = 1; |
|
| 43 | + const STATE_CLEAN = 1; |
|
| 44 | 44 | |
| 45 | 45 | /** |
| 46 | 46 | * A query object is in state DIRTY when it has DQL parts that have not yet been |
@@ -707,11 +707,11 @@ discard block |
||
| 707 | 707 | ->getName(); |
| 708 | 708 | |
| 709 | 709 | return md5( |
| 710 | - $this->getDql() . serialize($this->_hints) . |
|
| 711 | - '&platform=' . $platform . |
|
| 712 | - ($this->_em->hasFilters() ? $this->_em->getFilters()->getHash() : '') . |
|
| 713 | - '&firstResult=' . $this->_firstResult . '&maxResult=' . $this->_maxResults . |
|
| 714 | - '&hydrationMode=' . $this->_hydrationMode . '&types=' . serialize($this->_parsedTypes) . 'DOCTRINE_QUERY_CACHE_SALT' |
|
| 710 | + $this->getDql().serialize($this->_hints). |
|
| 711 | + '&platform='.$platform. |
|
| 712 | + ($this->_em->hasFilters() ? $this->_em->getFilters()->getHash() : ''). |
|
| 713 | + '&firstResult='.$this->_firstResult.'&maxResult='.$this->_maxResults. |
|
| 714 | + '&hydrationMode='.$this->_hydrationMode.'&types='.serialize($this->_parsedTypes).'DOCTRINE_QUERY_CACHE_SALT' |
|
| 715 | 715 | ); |
| 716 | 716 | } |
| 717 | 717 | |
@@ -720,7 +720,7 @@ discard block |
||
| 720 | 720 | */ |
| 721 | 721 | protected function getHash() |
| 722 | 722 | { |
| 723 | - return sha1(parent::getHash(). '-'. $this->_firstResult . '-' . $this->_maxResults); |
|
| 723 | + return sha1(parent::getHash().'-'.$this->_firstResult.'-'.$this->_maxResults); |
|
| 724 | 724 | } |
| 725 | 725 | |
| 726 | 726 | /** |
@@ -620,7 +620,7 @@ |
||
| 620 | 620 | * Executes the query and returns an IterableResult that can be used to incrementally |
| 621 | 621 | * iterated over the result. |
| 622 | 622 | * |
| 623 | - * @param ArrayCollection|array|null $parameters The query parameters. |
|
| 623 | + * @param null|ArrayCollection $parameters The query parameters. |
|
| 624 | 624 | * @param integer $hydrationMode The hydration mode to use. |
| 625 | 625 | * |
| 626 | 626 | * @return \Doctrine\ORM\Internal\Hydration\IterableResult |
@@ -19,7 +19,6 @@ |
||
| 19 | 19 | |
| 20 | 20 | namespace Doctrine\ORM; |
| 21 | 21 | |
| 22 | -use Doctrine\DBAL\Driver\Connection; |
|
| 23 | 22 | use Doctrine\DBAL\LockMode; |
| 24 | 23 | use Doctrine\ORM\Query\Exec\AbstractSqlExecutor; |
| 25 | 24 | use Doctrine\ORM\Query\Parser; |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | */ |
| 101 | 101 | public function referenceColumnName() |
| 102 | 102 | { |
| 103 | - return $this->case === CASE_UPPER ? 'ID' : 'id'; |
|
| 103 | + return $this->case === CASE_UPPER ? 'ID' : 'id'; |
|
| 104 | 104 | } |
| 105 | 105 | |
| 106 | 106 | /** |
@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | */ |
| 109 | 109 | public function joinColumnName($propertyName, $className = null) |
| 110 | 110 | { |
| 111 | - return $this->underscore($propertyName) . '_' . $this->referenceColumnName(); |
|
| 111 | + return $this->underscore($propertyName).'_'.$this->referenceColumnName(); |
|
| 112 | 112 | } |
| 113 | 113 | |
| 114 | 114 | /** |
@@ -116,7 +116,7 @@ discard block |
||
| 116 | 116 | */ |
| 117 | 117 | public function joinTableName($sourceEntity, $targetEntity, $propertyName = null) |
| 118 | 118 | { |
| 119 | - return $this->classToTableName($sourceEntity) . '_' . $this->classToTableName($targetEntity); |
|
| 119 | + return $this->classToTableName($sourceEntity).'_'.$this->classToTableName($targetEntity); |
|
| 120 | 120 | } |
| 121 | 121 | |
| 122 | 122 | /** |
@@ -124,7 +124,7 @@ discard block |
||
| 124 | 124 | */ |
| 125 | 125 | public function joinKeyColumnName($entityName, $referencedColumnName = null) |
| 126 | 126 | { |
| 127 | - return $this->classToTableName($entityName) . '_' . |
|
| 127 | + return $this->classToTableName($entityName).'_'. |
|
| 128 | 128 | ($referencedColumnName ?: $this->referenceColumnName()); |
| 129 | 129 | } |
| 130 | 130 | |