doctrine / orm

lib/Doctrine/ORM/Query/Printer.php

Spacing +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
      */
     public function startProduction($name)
     {
-        $this->println('(' . $name);
+        $this->println('('.$name);
         $this->_indent++;
     }
 

lib/Doctrine/ORM/Query/Expr.php

Spacing +8 added lines, -8 removed lines

@@ -268,7 +268,7 @@ 
      */
     public function countDistinct($x)
     {
-        return 'COUNT(DISTINCT ' . implode(', ', func_get_args()) . ')';
+        return 'COUNT(DISTINCT '.implode(', ', func_get_args()).')';
     }
 
     /**
@@ -450,7 +450,7 @@ 
             }
         }
 
-        return new Expr\Func($x . ' IN', (array) $y);
+        return new Expr\Func($x.' IN', (array) $y);
     }
 
     /**
@@ -471,7 +471,7 @@ 
             }
         }
 
-        return new Expr\Func($x . ' NOT IN', (array) $y);
+        return new Expr\Func($x.' NOT IN', (array) $y);
     }
 
     /**
@@ -483,7 +483,7 @@ 
      */
     public function isNull($x)
     {
-        return $x . ' IS NULL';
+        return $x.' IS NULL';
     }
 
     /**
@@ -495,7 +495,7 @@ 
      */
     public function isNotNull($x)
     {
-        return $x . ' IS NOT NULL';
+        return $x.' IS NOT NULL';
     }
 
     /**
@@ -613,12 +613,12 @@ 
      */
     private function _quoteLiteral($literal)
     {
-        if (is_numeric($literal) && !is_string($literal)) {
+        if (is_numeric($literal) && ! is_string($literal)) {
             return (string) $literal;
         } else if (is_bool($literal)) {
             return $literal ? "true" : "false";
         } else {
-            return "'" . str_replace("'", "''", $literal) . "'";
+            return "'".str_replace("'", "''", $literal)."'";
         }
     }
 
@@ -633,7 +633,7 @@ 
      */
     public function between($val, $x, $y)
     {
-        return $val . ' BETWEEN ' . $x . ' AND ' . $y;
+        return $val.' BETWEEN '.$x.' AND '.$y;
     }
 
     /**

Doc Comments +33 added lines, -33 removed lines

@@ -75,7 +75,7 @@ 
     /**
      * Creates an ASCending order expression.
      *
-     * @param mixed $expr
+     * @param string $expr
      *
      * @return Expr\OrderBy
      */
@@ -87,7 +87,7 @@ 
     /**
      * Creates a DESCending order expression.
      *
-     * @param mixed $expr
+     * @param string $expr
      *
      * @return Expr\OrderBy
      */
@@ -125,8 +125,8 @@ 
      *     // u.id <> ?1
      *     $q->where($q->expr()->neq('u.id', '?1'));
      *
-     * @param mixed $x Left expression.
-     * @param mixed $y Right expression.
+     * @param string $x Left expression.
+     * @param string $y Right expression.
      *
      * @return Expr\Comparison
      */
@@ -214,7 +214,7 @@ 
     /**
      * Creates an instance of AVG() function, with the given argument.
      *
-     * @param mixed $x Argument to be used in AVG() function.
+     * @param string $x Argument to be used in AVG() function.
      *
      * @return Expr\Func
      */
@@ -226,7 +226,7 @@ 
     /**
      * Creates an instance of MAX() function, with the given argument.
      *
-     * @param mixed $x Argument to be used in MAX() function.
+     * @param string $x Argument to be used in MAX() function.
      *
      * @return Expr\Func
      */
@@ -238,7 +238,7 @@ 
     /**
      * Creates an instance of MIN() function, with the given argument.
      *
-     * @param mixed $x Argument to be used in MIN() function.
+     * @param string $x Argument to be used in MIN() function.
      *
      * @return Expr\Func
      */
@@ -250,7 +250,7 @@ 
     /**
      * Creates an instance of COUNT() function, with the given argument.
      *
-     * @param mixed $x Argument to be used in COUNT() function.
+     * @param string $x Argument to be used in COUNT() function.
      *
      * @return Expr\Func
      */
@@ -262,7 +262,7 @@ 
     /**
      * Creates an instance of COUNT(DISTINCT) function, with the given argument.
      *
-     * @param mixed $x Argument to be used in COUNT(DISTINCT) function.
+     * @param string $x Argument to be used in COUNT(DISTINCT) function.
      *
      * @return string
      */
@@ -274,7 +274,7 @@ 
     /**
      * Creates an instance of EXISTS() function, with the given DQL Subquery.
      *
-     * @param mixed $subquery DQL Subquery to be used in EXISTS() function.
+     * @param \Doctrine\ORM\QueryBuilder $subquery DQL Subquery to be used in EXISTS() function.
      *
      * @return Expr\Func
      */
@@ -298,7 +298,7 @@ 
     /**
      * Creates a SOME() function expression with the given DQL subquery.
      *
-     * @param mixed $subquery DQL Subquery to be used in SOME() function.
+     * @param \Doctrine\ORM\QueryBuilder $subquery DQL Subquery to be used in SOME() function.
      *
      * @return Expr\Func
      */
@@ -310,7 +310,7 @@ 
     /**
      * Creates an ANY() function expression with the given DQL subquery.
      *
-     * @param mixed $subquery DQL Subquery to be used in ANY() function.
+     * @param \Doctrine\ORM\QueryBuilder $subquery DQL Subquery to be used in ANY() function.
      *
      * @return Expr\Func
      */
@@ -334,7 +334,7 @@ 
     /**
      * Creates an ABS() function expression with the given argument.
      *
-     * @param mixed $x Argument to be used in ABS() function.
+     * @param integer $x Argument to be used in ABS() function.
      *
      * @return Expr\Func
      */
@@ -353,8 +353,8 @@ 
      *     // u.salary * u.percentAnnualSalaryIncrease
      *     $q->expr()->prod('u.salary', 'u.percentAnnualSalaryIncrease')
      *
-     * @param mixed $x Left expression.
-     * @param mixed $y Right expression.
+     * @param integer $x Left expression.
+     * @param integer $y Right expression.
      *
      * @return Expr\Math
      */
@@ -372,7 +372,7 @@ 
      *     // u.monthlySubscriptionCount - 1
      *     $q->expr()->diff('u.monthlySubscriptionCount', '1')
      *
-     * @param mixed $x Left expression.
+     * @param integer $x Left expression.
      * @param mixed $y Right expression.
      *
      * @return Expr\Math
@@ -391,8 +391,8 @@ 
      *     // u.numChildren + 1
      *     $q->expr()->sum('u.numChildren', '1')
      *
-     * @param mixed $x Left expression.
-     * @param mixed $y Right expression.
+     * @param integer $x Left expression.
+     * @param integer $y Right expression.
      *
      * @return Expr\Math
      */
@@ -411,7 +411,7 @@ 
      *     $expr->quot('u.total', 'u.period')
      *
      * @param mixed $x Left expression.
-     * @param mixed $y Right expression.
+     * @param integer $y Right expression.
      *
      * @return Expr\Math
      */
@@ -423,7 +423,7 @@ 
     /**
      * Creates a SQRT() function expression with the given argument.
      *
-     * @param mixed $x Argument to be used in SQRT() function.
+     * @param integer $x Argument to be used in SQRT() function.
      *
      * @return Expr\Func
      */
@@ -502,7 +502,7 @@ 
      * Creates a LIKE() comparison expression with the given arguments.
      *
      * @param string $x Field in string format to be inspected by LIKE() comparison.
-     * @param mixed  $y Argument to be used in LIKE() comparison.
+     * @param string  $y Argument to be used in LIKE() comparison.
      *
      * @return Expr\Comparison
      */
@@ -515,7 +515,7 @@ 
      * Creates a NOT LIKE() comparison expression with the given arguments.
      *
      * @param string $x Field in string format to be inspected by LIKE() comparison.
-     * @param mixed  $y Argument to be used in LIKE() comparison.
+     * @param string  $y Argument to be used in LIKE() comparison.
      *
      * @return Expr\Comparison
      */
@@ -527,8 +527,8 @@ 
     /**
      * Creates a CONCAT() function expression with the given arguments.
      *
-     * @param mixed $x First argument to be used in CONCAT() function.
-     * @param mixed $y,... Other arguments to be used in CONCAT() function.
+     * @param string $x First argument to be used in CONCAT() function.
+     * @param string $y
      *
      * @return Expr\Func
      */
@@ -540,7 +540,7 @@ 
     /**
      * Creates a SUBSTRING() function expression with the given arguments.
      *
-     * @param mixed    $x    Argument to be used as string to be cropped by SUBSTRING() function.
+     * @param string    $x    Argument to be used as string to be cropped by SUBSTRING() function.
      * @param int      $from Initial offset to start cropping string. May accept negative values.
      * @param int|null $len  Length of crop. May accept negative values.
      *
@@ -559,7 +559,7 @@ 
     /**
      * Creates a LOWER() function expression with the given argument.
      *
-     * @param mixed $x Argument to be used in LOWER() function.
+     * @param string $x Argument to be used in LOWER() function.
      *
      * @return Expr\Func A LOWER function expression.
      */
@@ -571,7 +571,7 @@ 
     /**
      * Creates an UPPER() function expression with the given argument.
      *
-     * @param mixed $x Argument to be used in UPPER() function.
+     * @param string $x Argument to be used in UPPER() function.
      *
      * @return Expr\Func An UPPER function expression.
      */
@@ -583,7 +583,7 @@ 
     /**
      * Creates a LENGTH() function expression with the given argument.
      *
-     * @param mixed $x Argument to be used as argument of LENGTH() function.
+     * @param string $x Argument to be used as argument of LENGTH() function.
      *
      * @return Expr\Func A LENGTH function expression.
      */
@@ -625,11 +625,11 @@ 
     /**
      * Creates an instance of BETWEEN() function, with the given argument.
      *
-     * @param mixed          $val Valued to be inspected by range values.
-     * @param integer|string $x   Starting range value to be used in BETWEEN() function.
-     * @param integer|string $y   End point value to be used in BETWEEN() function.
+     * @param string          $val Valued to be inspected by range values.
+     * @param integer $x   Starting range value to be used in BETWEEN() function.
+     * @param integer $y   End point value to be used in BETWEEN() function.
      *
-     * @return Expr\Func A BETWEEN expression.
+     * @return string A BETWEEN expression.
      */
     public function between($val, $x, $y)
     {
@@ -639,7 +639,7 @@ 
     /**
      * Creates an instance of TRIM() function, with the given argument.
      *
-     * @param mixed $x Argument to be used as argument of TRIM() function.
+     * @param string $x Argument to be used as argument of TRIM() function.
      *
      * @return Expr\Func a TRIM expression.
      */

lib/Doctrine/ORM/Query/ResultSetMapping.php

Braces +3 added lines, -1 removed lines

@@ -227,7 +227,9 @@
         $found = false;
 
         foreach (array_merge($this->metaMappings, $this->fieldMappings) as $columnName => $columnFieldName) {
-            if ( ! ($columnFieldName === $fieldName && $this->columnOwnerMap[$columnName] === $alias)) continue;
+            if ( ! ($columnFieldName === $fieldName && $this->columnOwnerMap[$columnName] === $alias)) {
+                continue;
+            }
 
             $this->addIndexByColumn($alias, $columnName);
             $found = true;

lib/Doctrine/ORM/Query/Filter/SQLFilter.php

Spacing +3 added lines, -3 removed lines

@@ -100,8 +100,8 @@ 
      */
     final public function getParameter($name)
     {
-        if (!isset($this->parameters[$name])) {
-            throw new \InvalidArgumentException("Parameter '" . $name . "' does not exist.");
+        if ( ! isset($this->parameters[$name])) {
+            throw new \InvalidArgumentException("Parameter '".$name."' does not exist.");
         }
 
         return $this->em->getConnection()->quote($this->parameters[$name]['value'], $this->parameters[$name]['type']);
@@ -116,7 +116,7 @@ 
      */
     final public function hasParameter($name)
     {
-        if (!isset($this->parameters[$name])) {
+        if ( ! isset($this->parameters[$name])) {
             return false;
         }
 

lib/Doctrine/ORM/Repository/DefaultRepositoryFactory.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
      */
     public function getRepository(EntityManagerInterface $entityManager, $entityName)
     {
-        $repositoryHash = $entityManager->getClassMetadata($entityName)->getName() . spl_object_hash($entityManager);
+        $repositoryHash = $entityManager->getClassMetadata($entityName)->getName().spl_object_hash($entityManager);
 
         if (isset($this->repositoryList[$repositoryHash])) {
             return $this->repositoryList[$repositoryHash];

lib/Doctrine/ORM/OptimisticLockException.php

Spacing +2 added lines, -2 removed lines

@@ -76,7 +76,7 @@ 
         $expectedLockVersion = ($expectedLockVersion instanceof \DateTime) ? $expectedLockVersion->getTimestamp() : $expectedLockVersion;
         $actualLockVersion = ($actualLockVersion instanceof \DateTime) ? $actualLockVersion->getTimestamp() : $actualLockVersion;
 
-        return new self("The optimistic lock failed, version " . $expectedLockVersion . " was expected, but is actually ".$actualLockVersion, $entity);
+        return new self("The optimistic lock failed, version ".$expectedLockVersion." was expected, but is actually ".$actualLockVersion, $entity);
     }
 
     /**
@@ -86,6 +86,6 @@ 
      */
     public static function notVersioned($entityName)
     {
-        return new self("Cannot obtain optimistic lock on unversioned entity " . $entityName, null);
+        return new self("Cannot obtain optimistic lock on unversioned entity ".$entityName, null);
     }
 }

lib/Doctrine/ORM/Utility/PersisterHelper.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 
         $assoc = $class->associationMappings[$fieldName];
 
-        if (! $assoc['isOwningSide']) {
+        if ( ! $assoc['isOwningSide']) {
             return self::getTypeOfField($assoc['mappedBy'], $em->getClassMetadata($assoc['targetEntity']), $em);
         }
 

lib/Doctrine/ORM/Proxy/ProxyFactory.php

Spacing +2 added lines, -2 removed lines

@@ -125,7 +125,7 @@ 
     {
         $wakeupProxy = $classMetadata->getReflectionClass()->hasMethod('__wakeup');
 
-        return function (BaseProxy $proxy) use ($entityPersister, $classMetadata, $wakeupProxy) {
+        return function(BaseProxy $proxy) use ($entityPersister, $classMetadata, $wakeupProxy) {
             $initializer = $proxy->__getInitializer();
             $cloner      = $proxy->__getCloner();
 
@@ -177,7 +177,7 @@ 
      */
     private function createCloner(ClassMetadata $classMetadata, EntityPersister $entityPersister)
     {
-        return function (BaseProxy $proxy) use ($entityPersister, $classMetadata) {
+        return function(BaseProxy $proxy) use ($entityPersister, $classMetadata) {
             if ($proxy->__isInitialized()) {
                 return;
             }

lib/Doctrine/ORM/AbstractQuery.php

Indentation +4 added lines, -4 removed lines

@@ -212,10 +212,10 @@
     }
 
     /**
-    * Obtain the name of the second level query cache region in which query results will be stored
-    *
-    * @return string|null The cache region name; NULL indicates the default region.
-    */
+     * Obtain the name of the second level query cache region in which query results will be stored
+     *
+     * @return string|null The cache region name; NULL indicates the default region.
+     */
     public function getCacheRegion()
     {
         return $this->cacheRegion;

Spacing +5 added lines, -5 removed lines

@@ -324,7 +324,7 @@ 
     public function getParameter($key)
     {
         $filteredParameters = $this->parameters->filter(
-            function ($parameter) use ($key)
+            function($parameter) use ($key)
             {
                 // Must not be identical because of string to integer conversion
                 return ($key == $parameter->getName());
@@ -373,7 +373,7 @@ 
     public function setParameter($key, $value, $type = null)
     {
         $filteredParameters = $this->parameters->filter(
-            function ($parameter) use ($key)
+            function($parameter) use ($key)
             {
                 // Must not be identical because of string to integer conversion
                 return ($key == $parameter->getName());
@@ -469,7 +469,7 @@ 
      */
     private function translateNamespaces(Query\ResultSetMapping $rsm)
     {
-        $translate = function ($alias) {
+        $translate = function($alias) {
             return $this->_em->getClassMetadata($alias)->getName();
         };
 
@@ -1000,7 +1000,7 @@ 
             $this->getTimestampKey()
         );
 
-        $result     = $queryCache->get($queryKey, $rsm, $this->_hints);
+        $result = $queryCache->get($queryKey, $rsm, $this->_hints);
 
         if ($result !== null) {
             if ($this->cacheLogger) {
@@ -1136,6 +1136,6 @@ 
 
         ksort($hints);
 
-        return sha1($query . '-' . serialize($params) . '-' . serialize($hints));
+        return sha1($query.'-'.serialize($params).'-'.serialize($hints));
     }
 }

Doc Comments +1 added lines, -1 removed lines

@@ -1044,7 +1044,7 @@
      * Will return the configured id if it exists otherwise a hash will be
      * automatically generated for you.
      *
-     * @return array ($key, $hash)
+     * @return string[] ($key, $hash)
      */
     protected function getHydrationCacheId()
     {

Unused Use Statements -1 removed lines

@@ -22,7 +22,6 @@
 use Doctrine\Common\Util\ClassUtils;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\ArrayCollection;
-
 use Doctrine\ORM\Query\Parameter;
 use Doctrine\ORM\Cache\QueryCacheKey;
 use Doctrine\DBAL\Cache\QueryCacheProfile;