doctrine / orm

lib/Doctrine/ORM/Cache/DefaultEntityHydrator.php

Unused Use Statements -1 removed lines

@@ -21,7 +21,6 @@
 namespace Doctrine\ORM\Cache;
 
 use Doctrine\Common\Util\ClassUtils;
-
 use Doctrine\ORM\Query;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\EntityManagerInterface;

Spacing +2 added lines, -2 removed lines

@@ -109,7 +109,7 @@ 
 
                     $targetAssoc = $targetClassMetadata->associationMappings[$fieldName];
 
-                    foreach($assoc['targetToSourceKeyColumns'] as $referencedColumn => $localColumn) {
+                    foreach ($assoc['targetToSourceKeyColumns'] as $referencedColumn => $localColumn) {
                         if (isset($targetAssoc['sourceToTargetKeyColumns'][$referencedColumn])) {
                             $data[$localColumn] = $fieldValue;
                         }
@@ -161,7 +161,7 @@ 
         }
 
         foreach ($metadata->associationMappings as $name => $assoc) {
-            if ( ! isset($assoc['cache']) ||  ! isset($data[$name])) {
+            if ( ! isset($assoc['cache']) || ! isset($data[$name])) {
                 continue;
             }
 

lib/Doctrine/ORM/Cache/Persister/Entity/AbstractEntityPersister.php

Doc Comments +1 added lines, -1 removed lines

@@ -282,7 +282,7 @@
     /**
      * Generates a string of currently query
      *
-     * @param array   $query
+     * @param string   $query
      * @param string  $criteria
      * @param array   $orderBy
      * @param integer $limit

Unused Use Statements -1 removed lines

@@ -31,7 +31,6 @@
 use Doctrine\ORM\PersistentCollection;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Persisters\Entity\EntityPersister;
-
 use Doctrine\Common\Util\ClassUtils;
 use Doctrine\Common\Collections\Criteria;
 

Spacing +1 added lines, -1 removed lines

@@ -296,7 +296,7 @@
             ? $this->persister->expandCriteriaParameters($criteria)
             : $this->persister->expandParameters($criteria);
 
-        return sha1($query . serialize($params) . serialize($orderBy) . $limit . $offset);
+        return sha1($query.serialize($params).serialize($orderBy).$limit.$offset);
     }
 
     /**

Indentation +6 added lines, -6 removed lines

@@ -41,9 +41,9 @@ 
  */
 abstract class AbstractEntityPersister implements CachedEntityPersister
 {
-     /**
-     * @var \Doctrine\ORM\UnitOfWork
-     */
+        /**
+         * @var \Doctrine\ORM\UnitOfWork
+         */
     protected $uow;
 
     /**
@@ -61,9 +61,9 @@ 
      */
     protected $class;
 
-     /**
-     * @var array
-     */
+        /**
+         * @var array
+         */
     protected $queuedCache = [];
 
     /**

lib/Doctrine/ORM/NativeQuery.php

Doc Comments +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
     /**
      * Gets the SQL query.
      *
-     * @return mixed The built SQL query or an array of all SQL queries.
+     * @return string The built SQL query or an array of all SQL queries.
      *
      * @override
      */

lib/Doctrine/ORM/PersistentCollection.php

Doc Comments +1 added lines, -1 removed lines

@@ -579,7 +579,7 @@
      * Internal note: Tried to implement Serializable first but that did not work well
      *                with circular references. This solution seems simpler and works well.
      *
-     * @return array
+     * @return string[]
      */
     public function __sleep()
     {

Spacing +2 added lines, -2 removed lines

@@ -403,7 +403,7 @@ 
      */
     public function containsKey($key)
     {
-        if (! $this->initialized && $this->association['fetch'] === ClassMetadata::FETCH_EXTRA_LAZY
+        if ( ! $this->initialized && $this->association['fetch'] === ClassMetadata::FETCH_EXTRA_LAZY
             && isset($this->association['indexBy'])) {
             $persister = $this->em->getUnitOfWork()->getCollectionPersister($this->association);
 
@@ -436,7 +436,7 @@ 
             && $this->association['fetch'] === ClassMetadata::FETCH_EXTRA_LAZY
             && isset($this->association['indexBy'])
         ) {
-            if (!$this->typeClass->isIdentifierComposite && $this->typeClass->isIdentifier($this->association['indexBy'])) {
+            if ( ! $this->typeClass->isIdentifierComposite && $this->typeClass->isIdentifier($this->association['indexBy'])) {
                 return $this->em->find($this->typeClass->name, $key);
             }
 

lib/Doctrine/ORM/Query/QueryExpressionVisitor.php

Unused Use Statements -1 removed lines

@@ -20,7 +20,6 @@
 namespace Doctrine\ORM\Query;
 
 use Doctrine\Common\Collections\ArrayCollection;
-
 use Doctrine\Common\Collections\Expr\ExpressionVisitor;
 use Doctrine\Common\Collections\Expr\Comparison;
 use Doctrine\Common\Collections\Expr\CompositeExpression;

Spacing +11 added lines, -11 removed lines

@@ -114,7 +114,7 @@ 
             $expressionList[] = $this->dispatch($child);
         }
 
-        switch($expr->getType()) {
+        switch ($expr->getType()) {
             case CompositeExpression::TYPE_AND:
                 return new Expr\Andx($expressionList);
 
@@ -122,7 +122,7 @@ 
                 return new Expr\Orx($expressionList);
 
             default:
-                throw new \RuntimeException("Unknown composite " . $expr->getType());
+                throw new \RuntimeException("Unknown composite ".$expr->getType());
         }
     }
 
@@ -136,10 +136,10 @@ 
             throw new QueryException('No aliases are set before invoking walkComparison().');
         }
 
-        $field = $this->queryAliases[0] . '.' . $comparison->getField();
+        $field = $this->queryAliases[0].'.'.$comparison->getField();
 
-        foreach($this->queryAliases as $alias) {
-            if(strpos($comparison->getField() . '.', $alias . '.') === 0) {
+        foreach ($this->queryAliases as $alias) {
+            if (strpos($comparison->getField().'.', $alias.'.') === 0) {
                 $field = $comparison->getField();
                 break;
             }
@@ -149,13 +149,13 @@ 
 
         foreach ($this->parameters as $parameter) {
             if ($parameter->getName() === $parameterName) {
-                $parameterName .= '_' . count($this->parameters);
+                $parameterName .= '_'.count($this->parameters);
                 break;
             }
         }
 
         $parameter = new Parameter($parameterName, $this->walkValue($comparison->getValue()));
-        $placeholder = ':' . $parameterName;
+        $placeholder = ':'.$parameterName;
 
         switch ($comparison->getOperator()) {
             case Comparison::IN:
@@ -182,17 +182,17 @@ 
 
                 return $this->expr->neq($field, $placeholder);
             case Comparison::CONTAINS:
-                $parameter->setValue('%' . $parameter->getValue() . '%', $parameter->getType());
+                $parameter->setValue('%'.$parameter->getValue().'%', $parameter->getType());
                 $this->parameters[] = $parameter;
 
                 return $this->expr->like($field, $placeholder);
             case Comparison::STARTS_WITH:
-                $parameter->setValue($parameter->getValue() . '%', $parameter->getType());
+                $parameter->setValue($parameter->getValue().'%', $parameter->getType());
                 $this->parameters[] = $parameter;
 
                 return $this->expr->like($field, $placeholder);
             case Comparison::ENDS_WITH:
-                $parameter->setValue('%' . $parameter->getValue(), $parameter->getType());
+                $parameter->setValue('%'.$parameter->getValue(), $parameter->getType());
                 $this->parameters[] = $parameter;
 
                 return $this->expr->like($field, $placeholder);
@@ -208,7 +208,7 @@ 
                     );
                 }
 
-                throw new \RuntimeException("Unknown comparison operator: " . $comparison->getOperator());
+                throw new \RuntimeException("Unknown comparison operator: ".$comparison->getOperator());
         }
     }
 

lib/Doctrine/ORM/Query/ResultSetMapping.php

Doc Comments +1 added lines, -1 removed lines

@@ -389,7 +389,7 @@
     /**
      * Adds a metadata parameter mappings.
      *
-     * @param mixed  $parameter The parameter name in the SQL result set.
+     * @param string  $parameter The parameter name in the SQL result set.
      * @param string $attribute The metadata attribute.
      */
     public function addMetadataParameterMapping($parameter, $attribute)

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/QueryBuilder.php

Unused Use Statements -1 removed lines

@@ -21,7 +21,6 @@
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Criteria;
-
 use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\Query\QueryExpressionVisitor;
 

Doc Comments +6 added lines, -8 removed lines

@@ -606,7 +606,7 @@ 
     /**
      * Gets a (previously set) query parameter of the query being constructed.
      *
-     * @param mixed $key The key (index or name) of the bound parameter.
+     * @param string $key The key (index or name) of the bound parameter.
      *
      * @return Query\Parameter|null The value of the bound parameter.
      */
@@ -794,7 +794,7 @@ 
      *         ->leftJoin('u.Phonenumbers', 'p');
      * </code>
      *
-     * @param mixed $select The selection expression.
+     * @param string $select The selection expression.
      *
      * @return self
      */
@@ -1094,7 +1094,6 @@ 
      *         ->andWhere('u.is_active = 1');
      * </code>
      *
-     * @param mixed $where The query restrictions.
      *
      * @return self
      *
@@ -1127,7 +1126,6 @@ 
      *         ->orWhere('u.id = 2');
      * </code>
      *
-     * @param mixed $where The WHERE statement.
      *
      * @return self
      *
@@ -1192,7 +1190,7 @@ 
      * Specifies a restriction over the groups of the query.
      * Replaces any previous having restrictions, if any.
      *
-     * @param mixed $having The restriction over the groups.
+     * @param string $having The restriction over the groups.
      *
      * @return self
      */
@@ -1209,7 +1207,7 @@ 
      * Adds a restriction over the groups of the query, forming a logical
      * conjunction with any existing having restrictions.
      *
-     * @param mixed $having The restriction to append.
+     * @param string $having The restriction to append.
      *
      * @return self
      */
@@ -1232,7 +1230,7 @@ 
      * Adds a restriction over the groups of the query, forming a logical
      * disjunction with any existing having restrictions.
      *
-     * @param mixed $having The restriction to add.
+     * @param string $having The restriction to add.
      *
      * @return self
      */
@@ -1451,7 +1449,7 @@ 
     /**
      * Resets DQL parts.
      *
-     * @param array|null $parts
+     * @param string[] $parts
      *
      * @return self
      */

Indentation +26 added lines, -26 removed lines

@@ -118,11 +118,11 @@ 
      */
     private $joinRootAliases = [];
 
-     /**
-     * Whether to use second level cache, if available.
-     *
-     * @var boolean
-     */
+        /**
+         * Whether to use second level cache, if available.
+         *
+         * @var boolean
+         */
     protected $cacheable = false;
 
     /**
@@ -213,10 +213,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;
@@ -1373,10 +1373,10 @@ 
      */
     private function _getDQLForDelete()
     {
-         return 'DELETE'
-              . $this->_getReducedDQLQueryPart('from', ['pre' => ' ', 'separator' => ', '])
-              . $this->_getReducedDQLQueryPart('where', ['pre' => ' WHERE '])
-              . $this->_getReducedDQLQueryPart('orderBy', ['pre' => ' ORDER BY ', 'separator' => ', ']);
+            return 'DELETE'
+                . $this->_getReducedDQLQueryPart('from', ['pre' => ' ', 'separator' => ', '])
+                . $this->_getReducedDQLQueryPart('where', ['pre' => ' WHERE '])
+                . $this->_getReducedDQLQueryPart('orderBy', ['pre' => ' ORDER BY ', 'separator' => ', ']);
     }
 
     /**
@@ -1384,11 +1384,11 @@ 
      */
     private function _getDQLForUpdate()
     {
-         return 'UPDATE'
-              . $this->_getReducedDQLQueryPart('from', ['pre' => ' ', 'separator' => ', '])
-              . $this->_getReducedDQLQueryPart('set', ['pre' => ' SET ', 'separator' => ', '])
-              . $this->_getReducedDQLQueryPart('where', ['pre' => ' WHERE '])
-              . $this->_getReducedDQLQueryPart('orderBy', ['pre' => ' ORDER BY ', 'separator' => ', ']);
+            return 'UPDATE'
+                . $this->_getReducedDQLQueryPart('from', ['pre' => ' ', 'separator' => ', '])
+                . $this->_getReducedDQLQueryPart('set', ['pre' => ' SET ', 'separator' => ', '])
+                . $this->_getReducedDQLQueryPart('where', ['pre' => ' WHERE '])
+                . $this->_getReducedDQLQueryPart('orderBy', ['pre' => ' ORDER BY ', 'separator' => ', ']);
     }
 
     /**
@@ -1397,8 +1397,8 @@ 
     private function _getDQLForSelect()
     {
         $dql = 'SELECT'
-             . ($this->_dqlParts['distinct']===true ? ' DISTINCT' : '')
-             . $this->_getReducedDQLQueryPart('select', ['pre' => ' ', 'separator' => ', ']);
+                . ($this->_dqlParts['distinct']===true ? ' DISTINCT' : '')
+                . $this->_getReducedDQLQueryPart('select', ['pre' => ' ', 'separator' => ', ']);
 
         $fromParts   = $this->getDQLPart('from');
         $joinParts   = $this->getDQLPart('join');
@@ -1422,10 +1422,10 @@ 
         }
 
         $dql .= implode(', ', $fromClauses)
-              . $this->_getReducedDQLQueryPart('where', ['pre' => ' WHERE '])
-              . $this->_getReducedDQLQueryPart('groupBy', ['pre' => ' GROUP BY ', 'separator' => ', '])
-              . $this->_getReducedDQLQueryPart('having', ['pre' => ' HAVING '])
-              . $this->_getReducedDQLQueryPart('orderBy', ['pre' => ' ORDER BY ', 'separator' => ', ']);
+                . $this->_getReducedDQLQueryPart('where', ['pre' => ' WHERE '])
+                . $this->_getReducedDQLQueryPart('groupBy', ['pre' => ' GROUP BY ', 'separator' => ', '])
+                . $this->_getReducedDQLQueryPart('having', ['pre' => ' HAVING '])
+                . $this->_getReducedDQLQueryPart('orderBy', ['pre' => ' ORDER BY ', 'separator' => ', ']);
 
         return $dql;
     }
@@ -1445,8 +1445,8 @@ 
         }
 
         return (isset($options['pre']) ? $options['pre'] : '')
-             . (is_array($queryPart) ? implode($options['separator'], $queryPart) : $queryPart)
-             . (isset($options['post']) ? $options['post'] : '');
+                . (is_array($queryPart) ? implode($options['separator'], $queryPart) : $queryPart)
+                . (isset($options['post']) ? $options['post'] : '');
     }
 
     /**

Spacing +10 added lines, -10 removed lines

@@ -533,7 +533,7 @@ 
     public function setParameter($key, $value, $type = null)
     {
         $filteredParameters = $this->parameters->filter(
-            function ($parameter) use ($key)
+            function($parameter) use ($key)
             {
                 /* @var Query\Parameter $parameter */
                 // Must not be identical because of string to integer conversion
@@ -614,7 +614,7 @@ 
     public function getParameter($key)
     {
         $filteredParameters = $this->parameters->filter(
-            function ($parameter) use ($key)
+            function($parameter) use ($key)
             {
                 /* @var Query\Parameter $parameter */
                 // Must not be identical because of string to integer conversion
@@ -697,7 +697,7 @@ 
         }
 
         $isMultiple = is_array($this->_dqlParts[$dqlPartName])
-            && !($dqlPartName == 'join' && !$append);
+            && ! ($dqlPartName == 'join' && ! $append);
 
         // Allow adding any part retrieved from self::getDQLParts().
         if (is_array($dqlPart) && $dqlPartName != 'join') {
@@ -914,7 +914,7 @@ 
     {
         $rootAliases = $this->getRootAliases();
 
-        if (!in_array($alias, $rootAliases)) {
+        if ( ! in_array($alias, $rootAliases)) {
             throw new Query\QueryException(
                 sprintf('Specified root alias %s must be set before invoking indexBy().', $alias)
             );
@@ -1316,15 +1316,15 @@ 
             foreach ($criteria->getOrderings() as $sort => $order) {
 
                 $hasValidAlias = false;
-                foreach($allAliases as $alias) {
-                    if(strpos($sort . '.', $alias . '.') === 0) {
+                foreach ($allAliases as $alias) {
+                    if (strpos($sort.'.', $alias.'.') === 0) {
                         $hasValidAlias = true;
                         break;
                     }
                 }
 
-                if(!$hasValidAlias) {
-                    $sort = $allAliases[0] . '.' . $sort;
+                if ( ! $hasValidAlias) {
+                    $sort = $allAliases[0].'.'.$sort;
                 }
 
                 $this->addOrderBy($sort, $order);
@@ -1397,7 +1397,7 @@ 
     private function _getDQLForSelect()
     {
         $dql = 'SELECT'
-             . ($this->_dqlParts['distinct']===true ? ' DISTINCT' : '')
+             . ($this->_dqlParts['distinct'] === true ? ' DISTINCT' : '')
              . $this->_getReducedDQLQueryPart('select', ['pre' => ' ', 'separator' => ', ']);
 
         $fromParts   = $this->getDQLPart('from');
@@ -1413,7 +1413,7 @@ 
 
                 if ($from instanceof Expr\From && isset($joinParts[$from->getAlias()])) {
                     foreach ($joinParts[$from->getAlias()] as $join) {
-                        $fromClause .= ' ' . ((string) $join);
+                        $fromClause .= ' '.((string) $join);
                     }
                 }
 

tools/sandbox/index.php

Spacing +2 added lines, -2 removed lines

@@ -12,11 +12,11 @@
 use Entities\Address;
 use Entities\User;
 
-$em = require_once __DIR__ . '/bootstrap.php';
+$em = require_once __DIR__.'/bootstrap.php';
 
 ## PUT YOUR TEST CODE BELOW
 
 $user = new User;
 $address = new Address;
 
-echo 'Hello World!' . PHP_EOL;
+echo 'Hello World!'.PHP_EOL;

lib/Doctrine/ORM/Id/UuidGenerator.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
     public function generate(EntityManager $em, $entity)
     {
         $conn = $em->getConnection();
-        $sql = 'SELECT ' . $conn->getDatabasePlatform()->getGuidExpression();
+        $sql = 'SELECT '.$conn->getDatabasePlatform()->getGuidExpression();
 
         return $conn->query($sql)->fetchColumn(0);
     }