Completed
Pull Request — master (#6397)
by Vytautas
09:41
created
lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/CreateCommand.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -71,9 +71,9 @@
 block discarded – undo
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);
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/UpdateCommand.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -122,7 +122,7 @@
 block discarded – undo
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) {
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Tools/Console/Command/ConvertDoctrine1SchemaCommand.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -220,7 +220,7 @@
 block discarded – undo
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 {
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Tools/Console/Command/EnsureProductionSettingsCommand.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -71,7 +71,7 @@
 block discarded – undo
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
         }
Please login to merge, or discard this patch.
lib/Doctrine/ORM/EntityManagerInterface.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -242,17 +242,17 @@
 block discarded – undo
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
     /**
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Internal/Hydration/HydrationException.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -48,9 +48,9 @@
 block discarded – undo
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
     }
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -299,7 +299,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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;
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Internal/Hydration/IterableResult.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -105,6 +105,6 @@
 block discarded – undo
105 105
      */
106 106
     public function valid()
107 107
     {
108
-        return ($this->_current!=false);
108
+        return ($this->_current != false);
109 109
     }
110 110
 }
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Query.php 3 patches
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -715,9 +715,9 @@
 block discarded – undo
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);
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
     /**
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -620,7 +620,7 @@
 block discarded – undo
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
Please login to merge, or discard this patch.