doctrine / orm

lib/Doctrine/ORM/Query/Expr/Base.php

Spacing +2 added lines, -2 removed lines

@@ -86,7 +86,7 @@ 
      */
     public function add($arg)
     {
-        if ( $arg !== null && (!$arg instanceof self || $arg->count() > 0) ) {
+        if ($arg !== null && ( ! $arg instanceof self || $arg->count() > 0)) {
             // If we decide to keep Expr\Base instances, we can use this check
             if ( ! is_string($arg)) {
                 $class = get_class($arg);
@@ -119,6 +119,6 @@ 
             return (string) $this->parts[0];
         }
 
-        return $this->preSeparator . implode($this->separator, $this->parts) . $this->postSeparator;
+        return $this->preSeparator.implode($this->separator, $this->parts).$this->postSeparator;
     }
 }

lib/Doctrine/ORM/Query/Expr/OrderBy.php

Spacing +2 added lines, -2 removed lines

@@ -75,7 +75,7 @@ 
     public function add($sort, $order = null)
     {
         $order = ! $order ? 'ASC' : $order;
-        $this->parts[] = $sort . ' '. $order;
+        $this->parts[] = $sort.' '.$order;
     }
 
     /**
@@ -99,6 +99,6 @@ 
      */
     public function __tostring()
     {
-        return $this->preSeparator . implode($this->separator, $this->parts) . $this->postSeparator;
+        return $this->preSeparator.implode($this->separator, $this->parts).$this->postSeparator;
     }
 }

lib/Doctrine/ORM/Query/Expr/From.php

Spacing +2 added lines, -2 removed lines

@@ -86,7 +86,7 @@
      */
     public function __toString()
     {
-        return $this->from . ' ' . $this->alias .
-                ($this->indexBy ? ' INDEX BY ' . $this->indexBy : '');
+        return $this->from.' '.$this->alias.
+                ($this->indexBy ? ' INDEX BY '.$this->indexBy : '');
     }
 }

lib/Doctrine/ORM/Query/ResultSetMappingBuilder.php

Spacing +7 added lines, -7 removed lines

@@ -204,7 +204,7 @@ 
     {
         switch ($mode) {
             case self::COLUMN_RENAMING_INCREMENT:
-                return $columnName . $this->sqlCounter++;
+                return $columnName.$this->sqlCounter++;
 
             case self::COLUMN_RENAMING_CUSTOM:
                 return isset($customRenameColumns[$columnName])
@@ -327,19 +327,19 @@ 
         $counter        = 0;
         $resultMapping  = $class->getSqlResultSetMapping($resultSetMappingName);
         $rootShortName  = $class->reflClass->getShortName();
-        $rootAlias      = strtolower($rootShortName[0]) . $counter;
+        $rootAlias      = strtolower($rootShortName[0]).$counter;
 
 
         if (isset($resultMapping['entities'])) {
             foreach ($resultMapping['entities'] as $key => $entityMapping) {
-                $classMetadata  = $this->em->getClassMetadata($entityMapping['entityClass']);
+                $classMetadata = $this->em->getClassMetadata($entityMapping['entityClass']);
 
                 if ($class->reflClass->name == $classMetadata->reflClass->name) {
                     $this->addEntityResult($classMetadata->name, $rootAlias);
                     $this->addNamedNativeQueryEntityResultMapping($classMetadata, $entityMapping, $rootAlias);
                 } else {
                     $shortName      = $classMetadata->reflClass->getShortName();
-                    $joinAlias      = strtolower($shortName[0]) . ++ $counter;
+                    $joinAlias      = strtolower($shortName[0]).++ $counter;
                     $associations   = $class->getAssociationsByTargetClass($classMetadata->name);
 
                     $this->addNamedNativeQueryEntityResultMapping($classMetadata, $entityMapping, $joinAlias);
@@ -387,7 +387,7 @@ 
             $this->addMetaResult($alias, $discriminatorColumn, $discriminatorColumn, false, $discriminatorType);
         }
 
-        if (isset($entityMapping['fields']) && !empty($entityMapping['fields'])) {
+        if (isset($entityMapping['fields']) && ! empty($entityMapping['fields'])) {
             foreach ($entityMapping['fields'] as $field) {
                 $fieldName = $field['name'];
                 $relation  = null;
@@ -449,7 +449,7 @@ 
                 $sql .= ", ";
             }
 
-            $sql .= $tableAlias . ".";
+            $sql .= $tableAlias.".";
 
             if (isset($this->fieldMappings[$columnName])) {
                 $class = $this->em->getClassMetadata($this->declaringClasses[$columnName]);
@@ -460,7 +460,7 @@ 
                 $sql .= $this->discriminatorColumns[$dqlAlias];
             }
 
-            $sql .= " AS " . $columnName;
+            $sql .= " AS ".$columnName;
         }
 
         return $sql;

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 +31 added lines, -31 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 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/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/ORMInvalidArgumentException.php

Spacing +18 added lines, -18 removed lines

@@ -34,7 +34,7 @@ 
      */
     static public function scheduleInsertForManagedEntity($entity)
     {
-        return new self("A managed+dirty entity " . self::objToStr($entity) . " can not be scheduled for insertion.");
+        return new self("A managed+dirty entity ".self::objToStr($entity)." can not be scheduled for insertion.");
     }
 
     /**
@@ -44,7 +44,7 @@ 
      */
     static public function scheduleInsertForRemovedEntity($entity)
     {
-        return new self("Removed entity " . self::objToStr($entity) . " can not be scheduled for insertion.");
+        return new self("Removed entity ".self::objToStr($entity)." can not be scheduled for insertion.");
     }
 
     /**
@@ -54,7 +54,7 @@ 
      */
     static public function scheduleInsertTwice($entity)
     {
-        return new self("Entity " . self::objToStr($entity) . " can not be scheduled for insertion twice.");
+        return new self("Entity ".self::objToStr($entity)." can not be scheduled for insertion twice.");
     }
 
     /**
@@ -66,7 +66,7 @@ 
     static public function entityWithoutIdentity($className, $entity)
     {
         return new self(
-            "The given entity of type '" . $className . "' (".self::objToStr($entity).") has no identity/no " .
+            "The given entity of type '".$className."' (".self::objToStr($entity).") has no identity/no ".
             "id values set. It cannot be added to the identity map."
         );
     }
@@ -78,7 +78,7 @@ 
      */
     static public function readOnlyRequiresManagedEntity($entity)
     {
-        return new self("Only managed entities can be marked or checked as read only. But " . self::objToStr($entity) . " is not");
+        return new self("Only managed entities can be marked or checked as read only. But ".self::objToStr($entity)." is not");
     }
 
     /**
@@ -90,13 +90,13 @@ 
     static public function newEntityFoundThroughRelationship(array $assoc, $entry)
     {
         return new self("A new entity was found through the relationship '"
-            . $assoc['sourceEntity'] . "#" . $assoc['fieldName'] . "' that was not"
-            . " configured to cascade persist operations for entity: " . self::objToStr($entry) . "."
+            . $assoc['sourceEntity']."#".$assoc['fieldName']."' that was not"
+            . " configured to cascade persist operations for entity: ".self::objToStr($entry)."."
             . " To solve this issue: Either explicitly call EntityManager#persist()"
             . " on this unknown entity or configure cascade persist "
             . " this association in the mapping for example @ManyToOne(..,cascade={\"persist\"})."
-            . (method_exists($entry, '__toString') ? "": " If you cannot find out which entity causes the problem"
-            . " implement '" . $assoc['targetEntity'] . "#__toString()' to get a clue."));
+            . (method_exists($entry, '__toString') ? "" : " If you cannot find out which entity causes the problem"
+            . " implement '".$assoc['targetEntity']."#__toString()' to get a clue."));
     }
 
     /**
@@ -107,8 +107,8 @@ 
      */
     static public function detachedEntityFoundThroughRelationship(array $assoc, $entry)
     {
-        return new self("A detached entity of type " . $assoc['targetEntity'] . " (" . self::objToStr($entry) . ") "
-            . " was found through the relationship '" . $assoc['sourceEntity'] . "#" . $assoc['fieldName'] . "' "
+        return new self("A detached entity of type ".$assoc['targetEntity']." (".self::objToStr($entry).") "
+            . " was found through the relationship '".$assoc['sourceEntity']."#".$assoc['fieldName']."' "
             . "during cascading a persist operation.");
     }
 
@@ -119,7 +119,7 @@ 
      */
     static public function entityNotManaged($entity)
     {
-        return new self("Entity " . self::objToStr($entity) . " is not managed. An entity is managed if its fetched " .
+        return new self("Entity ".self::objToStr($entity)." is not managed. An entity is managed if its fetched ".
             "from the database or registered as new through EntityManager#persist");
     }
 
@@ -131,7 +131,7 @@ 
      */
     static public function entityHasNoIdentity($entity, $operation)
     {
-        return new self("Entity has no identity, therefore " . $operation ." cannot be performed. " . self::objToStr($entity));
+        return new self("Entity has no identity, therefore ".$operation." cannot be performed. ".self::objToStr($entity));
     }
 
     /**
@@ -142,7 +142,7 @@ 
      */
     static public function entityIsRemoved($entity, $operation)
     {
-        return new self("Entity is removed, therefore " . $operation ." cannot be performed. " . self::objToStr($entity));
+        return new self("Entity is removed, therefore ".$operation." cannot be performed. ".self::objToStr($entity));
     }
 
     /**
@@ -153,7 +153,7 @@ 
      */
     static public function detachedEntityCannot($entity, $operation)
     {
-        return new self("Detached entity " . self::objToStr($entity) . " cannot be " . $operation);
+        return new self("Detached entity ".self::objToStr($entity)." cannot be ".$operation);
     }
 
     /**
@@ -165,8 +165,8 @@ 
      */
     public static function invalidObject($context, $given, $parameterIndex = 1)
     {
-        return new self($context . ' expects parameter ' . $parameterIndex .
-            ' to be an entity object, '. gettype($given) . ' given.');
+        return new self($context.' expects parameter '.$parameterIndex.
+            ' to be an entity object, '.gettype($given).' given.');
     }
 
     /**
@@ -174,7 +174,7 @@ 
      */
     public static function invalidCompositeIdentifier()
     {
-        return new self("Binding an entity with a composite primary key to a query is not supported. " .
+        return new self("Binding an entity with a composite primary key to a query is not supported. ".
             "You should split the parameter into the explicit fields and bind them separately.");
     }