doctrine / orm

lib/Doctrine/ORM/Tools/Console/Command/RunDqlCommand.php

Spacing +1 added lines, -1 removed lines

@@ -95,7 +95,7 @@
         }
 
         $hydrationModeName = $input->getOption('hydrate');
-        $hydrationMode = 'Doctrine\ORM\Query::HYDRATE_' . strtoupper(str_replace('-', '_', $hydrationModeName));
+        $hydrationMode = 'Doctrine\ORM\Query::HYDRATE_'.strtoupper(str_replace('-', '_', $hydrationModeName));
 
         if ( ! defined($hydrationMode)) {
             throw new \RuntimeException(

Indentation +8 added lines, -8 removed lines

@@ -45,14 +45,14 @@
     protected function configure()
     {
         $this->setName('orm:run-dql')
-             ->setDescription('Executes arbitrary DQL directly from the command line')
-             ->addArgument('dql', InputArgument::REQUIRED, 'The DQL to execute.')
-             ->addOption('hydrate', null, InputOption::VALUE_REQUIRED, 'Hydration mode of result set. Should be either: object, array, scalar or single-scalar.', 'object')
-             ->addOption('first-result', null, InputOption::VALUE_REQUIRED, 'The first result in the result set.')
-             ->addOption('max-result', null, InputOption::VALUE_REQUIRED, 'The maximum number of results in the result set.')
-             ->addOption('depth', null, InputOption::VALUE_REQUIRED, 'Dumping depth of Entity graph.', 7)
-             ->addOption('show-sql', null, InputOption::VALUE_NONE, 'Dump generated SQL instead of executing query')
-             ->setHelp('Executes arbitrary DQL directly from the command line.');
+                ->setDescription('Executes arbitrary DQL directly from the command line')
+                ->addArgument('dql', InputArgument::REQUIRED, 'The DQL to execute.')
+                ->addOption('hydrate', null, InputOption::VALUE_REQUIRED, 'Hydration mode of result set. Should be either: object, array, scalar or single-scalar.', 'object')
+                ->addOption('first-result', null, InputOption::VALUE_REQUIRED, 'The first result in the result set.')
+                ->addOption('max-result', null, InputOption::VALUE_REQUIRED, 'The maximum number of results in the result set.')
+                ->addOption('depth', null, InputOption::VALUE_REQUIRED, 'Dumping depth of Entity graph.', 7)
+                ->addOption('show-sql', null, InputOption::VALUE_NONE, 'Dump generated SQL instead of executing query')
+                ->setHelp('Executes arbitrary DQL directly from the command line.');
     }
 
     /**

lib/Doctrine/ORM/Tools/Console/Command/ClearCache/EntityRegionCommand.php

Spacing +1 added lines, -1 removed lines

@@ -95,7 +95,7 @@
         }
 
         if ($input->getOption('flush')) {
-            $entityRegion  = $cache->getEntityCacheRegion($entityClass);
+            $entityRegion = $cache->getEntityCacheRegion($entityClass);
 
             if ( ! $entityRegion instanceof DefaultRegion) {
                 throw new \InvalidArgumentException(sprintf(

Indentation +7 added lines, -7 removed lines

@@ -42,12 +42,12 @@ 
     protected function configure()
     {
         $this->setName('orm:clear-cache:region:entity')
-             ->setDescription('Clear a second-level cache entity region')
-             ->addArgument('entity-class', InputArgument::OPTIONAL, 'The entity name.')
-             ->addArgument('entity-id', InputArgument::OPTIONAL, 'The entity identifier.')
-             ->addOption('all', null, InputOption::VALUE_NONE, 'If defined, all entity regions will be deleted/invalidated.')
-             ->addOption('flush', null, InputOption::VALUE_NONE, 'If defined, all cache entries will be flushed.')
-             ->setHelp(<<<EOT
+                ->setDescription('Clear a second-level cache entity region')
+                ->addArgument('entity-class', InputArgument::OPTIONAL, 'The entity name.')
+                ->addArgument('entity-id', InputArgument::OPTIONAL, 'The entity identifier.')
+                ->addOption('all', null, InputOption::VALUE_NONE, 'If defined, all entity regions will be deleted/invalidated.')
+                ->addOption('flush', null, InputOption::VALUE_NONE, 'If defined, all cache entries will be flushed.')
+                ->setHelp(<<<EOT
 The <info>%command.name%</info> command is meant to clear a second-level cache entity region for an associated Entity Manager.
 It is possible to delete/invalidate all entity region, a specific entity region or flushes the cache provider.
 
@@ -71,7 +71,7 @@ 
 Finally, be aware that if <info>--flush</info> option is passed,
 not all cache providers are able to flush entries, because of a limitation of its execution nature.
 EOT
-             );
+                );
     }
 
     /**

lib/Doctrine/ORM/Tools/Console/Command/ConvertDoctrine1SchemaCommand.php

Spacing +1 added lines, -1 removed lines

@@ -220,7 +220,7 @@
             $exporter->setMetadata($metadata);
             $exporter->export();
 
-            $output->writeln(PHP_EOL . sprintf(
+            $output->writeln(PHP_EOL.sprintf(
                 'Converting Doctrine 1.X schema to "<info>%s</info>" mapping type in "<info>%s</info>"', $toType, $destPath
             ));
         } else {

Indentation +9 added lines, -9 removed lines

@@ -100,15 +100,15 @@
     protected function configure()
     {
         $this->setName('orm:convert-d1-schema')
-             ->setAliases(['orm:convert:d1-schema'])
-             ->setDescription('Converts Doctrine 1.x schema into a Doctrine 2.x schema')
-             ->addArgument('from-path', InputArgument::REQUIRED, 'The path of Doctrine 1.X schema information.')
-             ->addArgument('to-type', InputArgument::REQUIRED, 'The destination Doctrine 2.X mapping type.')
-             ->addArgument('dest-path', InputArgument::REQUIRED, 'The path to generate your Doctrine 2.X mapping information.')
-             ->addOption('from', null, InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY, 'Optional paths of Doctrine 1.X schema information.', [])
-             ->addOption('extend', null, InputOption::VALUE_OPTIONAL, 'Defines a base class to be extended by generated entity classes.')
-             ->addOption('num-spaces', null, InputOption::VALUE_OPTIONAL, 'Defines the number of indentation spaces', 4)
-             ->setHelp('Converts Doctrine 1.x schema into a Doctrine 2.x schema.');
+                ->setAliases(['orm:convert:d1-schema'])
+                ->setDescription('Converts Doctrine 1.x schema into a Doctrine 2.x schema')
+                ->addArgument('from-path', InputArgument::REQUIRED, 'The path of Doctrine 1.X schema information.')
+                ->addArgument('to-type', InputArgument::REQUIRED, 'The destination Doctrine 2.X mapping type.')
+                ->addArgument('dest-path', InputArgument::REQUIRED, 'The path to generate your Doctrine 2.X mapping information.')
+                ->addOption('from', null, InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY, 'Optional paths of Doctrine 1.X schema information.', [])
+                ->addOption('extend', null, InputOption::VALUE_OPTIONAL, 'Defines a base class to be extended by generated entity classes.')
+                ->addOption('num-spaces', null, InputOption::VALUE_OPTIONAL, 'Defines the number of indentation spaces', 4)
+                ->setHelp('Converts Doctrine 1.x schema into a Doctrine 2.x schema.');
     }
 
     /**

lib/Doctrine/ORM/EntityManagerInterface.php

Indentation +11 added lines, -11 removed lines

@@ -242,17 +242,17 @@
     public function getUnitOfWork();
 
     /**
-    * Gets a hydrator for the given hydration mode.
-    *
-    * This method caches the hydrator instances which is used for all queries that don't
-    * selectively iterate over the result.
-    *
-    * @deprecated
-    *
-    * @param int $hydrationMode
-    *
-    * @return \Doctrine\ORM\Internal\Hydration\AbstractHydrator
-    */
+     * Gets a hydrator for the given hydration mode.
+     *
+     * This method caches the hydrator instances which is used for all queries that don't
+     * selectively iterate over the result.
+     *
+     * @deprecated
+     *
+     * @param int $hydrationMode
+     *
+     * @return \Doctrine\ORM\Internal\Hydration\AbstractHydrator
+     */
     public function getHydrator($hydrationMode);
 
     /**

lib/Doctrine/ORM/Internal/Hydration/HydrationException.php

Spacing +3 added lines, -3 removed lines

@@ -48,9 +48,9 @@
      */
     public static function emptyDiscriminatorValue($dqlAlias)
     {
-        return new self("The DQL alias '" . $dqlAlias . "' contains an entity ".
-            "of an inheritance hierarchy with an empty discriminator value. This means " .
-            "that the database contains inconsistent data with an empty " .
+        return new self("The DQL alias '".$dqlAlias."' contains an entity ".
+            "of an inheritance hierarchy with an empty discriminator value. This means ".
+            "that the database contains inconsistent data with an empty ".
             "discriminator value in a table row."
         );
     }

lib/Doctrine/ORM/Internal/Hydration/IterableResult.php

Spacing +1 added lines, -1 removed lines

@@ -105,6 +105,6 @@
      */
     public function valid()
     {
-        return ($this->_current!=false);
+        return ($this->_current != false);
     }
 }

lib/Doctrine/ORM/Query.php

Indentation +3 added lines, -3 removed lines

@@ -715,9 +715,9 @@
         );
     }
 
-     /**
-     * {@inheritdoc}
-     */
+        /**
+         * {@inheritdoc}
+         */
     protected function getHash()
     {
         return sha1(parent::getHash(). '-'. $this->_firstResult . '-' . $this->_maxResults);

Spacing +7 added lines, -7 removed lines

@@ -42,7 +42,7 @@ 
     /**
      * A query object is in CLEAN state when it has NO unparsed/unprocessed DQL parts.
      */
-    const STATE_CLEAN  = 1;
+    const STATE_CLEAN = 1;
 
     /**
      * A query object is in state DIRTY when it has DQL parts that have not yet been
@@ -738,11 +738,11 @@ 
             ->getName();
 
         return md5(
-            $this->getDQL() . serialize($this->_hints) .
-            '&platform=' . $platform .
-            ($this->_em->hasFilters() ? $this->_em->getFilters()->getHash() : '') .
-            '&firstResult=' . $this->_firstResult . '&maxResult=' . $this->_maxResults .
-            '&hydrationMode=' . $this->_hydrationMode . '&types=' . serialize($this->_parsedTypes) . 'DOCTRINE_QUERY_CACHE_SALT'
+            $this->getDQL().serialize($this->_hints).
+            '&platform='.$platform.
+            ($this->_em->hasFilters() ? $this->_em->getFilters()->getHash() : '').
+            '&firstResult='.$this->_firstResult.'&maxResult='.$this->_maxResults.
+            '&hydrationMode='.$this->_hydrationMode.'&types='.serialize($this->_parsedTypes).'DOCTRINE_QUERY_CACHE_SALT'
         );
     }
 
@@ -751,7 +751,7 @@ 
      */
     protected function getHash()
     {
-        return sha1(parent::getHash(). '-'. $this->_firstResult . '-' . $this->_maxResults);
+        return sha1(parent::getHash().'-'.$this->_firstResult.'-'.$this->_maxResults);
     }
 
     /**

lib/Doctrine/ORM/Mapping/UnderscoreNamingStrategy.php

Spacing +4 added lines, -4 removed lines

@@ -100,7 +100,7 @@ 
      */
     public function referenceColumnName()
     {
-        return $this->case === CASE_UPPER ?  'ID' : 'id';
+        return $this->case === CASE_UPPER ? 'ID' : 'id';
     }
 
     /**
@@ -108,7 +108,7 @@ 
      */
     public function joinColumnName($propertyName, $className = null)
     {
-        return $this->underscore($propertyName) . '_' . $this->referenceColumnName();
+        return $this->underscore($propertyName).'_'.$this->referenceColumnName();
     }
 
     /**
@@ -116,7 +116,7 @@ 
      */
     public function joinTableName($sourceEntity, $targetEntity, $propertyName = null)
     {
-        return $this->classToTableName($sourceEntity) . '_' . $this->classToTableName($targetEntity);
+        return $this->classToTableName($sourceEntity).'_'.$this->classToTableName($targetEntity);
     }
     
     /**
@@ -124,7 +124,7 @@ 
      */
     public function joinKeyColumnName($entityName, $referencedColumnName = null)
     {
-        return $this->classToTableName($entityName) . '_' .
+        return $this->classToTableName($entityName).'_'.
                 ($referencedColumnName ?: $this->referenceColumnName());
     }
     

lib/Doctrine/ORM/Mapping/AnsiQuoteStrategy.php

Spacing +1 added lines, -1 removed lines

@@ -91,6 +91,6 @@
      */
     public function getColumnAlias($columnName, $counter, AbstractPlatform $platform, ClassMetadata $class = null)
     {
-        return $platform->getSQLResultCasing($columnName . '_' . $counter);
+        return $platform->getSQLResultCasing($columnName.'_'.$counter);
     }
 }