@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | } else { |
87 | 87 | $sqls = $schemaTool->getDropSchemaSQL($metadatas); |
88 | 88 | } |
89 | - $output->writeln(implode(';' . PHP_EOL, $sqls)); |
|
89 | + $output->writeln(implode(';'.PHP_EOL, $sqls)); |
|
90 | 90 | |
91 | 91 | return 0; |
92 | 92 | } |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | return 0; |
106 | 106 | } |
107 | 107 | |
108 | - $output->writeln('<comment>ATTENTION</comment>: This operation should not be executed in a production environment.' . PHP_EOL); |
|
108 | + $output->writeln('<comment>ATTENTION</comment>: This operation should not be executed in a production environment.'.PHP_EOL); |
|
109 | 109 | |
110 | 110 | if ($isFullDatabaseDrop) { |
111 | 111 | $sqls = $schemaTool->getDropDatabaseSQL(); |
@@ -71,9 +71,9 @@ |
||
71 | 71 | { |
72 | 72 | if ($input->getOption('dump-sql')) { |
73 | 73 | $sqls = $schemaTool->getCreateSchemaSql($metadatas); |
74 | - $output->writeln(implode(';' . PHP_EOL, $sqls) . ';'); |
|
74 | + $output->writeln(implode(';'.PHP_EOL, $sqls).';'); |
|
75 | 75 | } else { |
76 | - $output->writeln('ATTENTION: This operation should not be executed in a production environment.' . PHP_EOL); |
|
76 | + $output->writeln('ATTENTION: This operation should not be executed in a production environment.'.PHP_EOL); |
|
77 | 77 | |
78 | 78 | $output->writeln('Creating database schema...'); |
79 | 79 | $schemaTool->createSchema($metadatas); |
@@ -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 | } |
@@ -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); |
@@ -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 |
@@ -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 | /** |