doctrine / orm

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

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 = [];
 
     /**

Doc Comments +4 added lines, -2 removed lines

@@ -285,7 +285,7 @@ 
     /**
      * Generates a string of currently query
      *
-     * @param array   $query
+     * @param string   $query
      * @param string  $criteria
      * @param array   $orderBy
      * @param integer $limit
@@ -352,6 +352,7 @@ 
 
     /**
      * {@inheritdoc}
+     * @param string $fieldName
      */
     public function getOwningTable($fieldName)
     {
@@ -376,6 +377,7 @@ 
 
     /**
      * {@inheritdoc}
+     * @param \Doctrine\Tests\Models\Cache\Country $entity
      */
     public function insert($entity)
     {
@@ -676,7 +678,7 @@ 
     }
 
     /**
-     * @param array $association
+     * @param AssociationMetadata $association
      * @param array $ownerId
      *
      * @return CollectionCacheKey

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Cache\Persister\Entity;
 
@@ -282,7 +282,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);
     }
 
     /**

lib/Doctrine/ORM/Cache/Persister/Collection/ReadOnlyCachedCollectionPersister.php

Indentation +3 added lines, -3 removed lines

@@ -30,9 +30,9 @@
  */
 class ReadOnlyCachedCollectionPersister extends NonStrictReadWriteCachedCollectionPersister
 {
-     /**
-     * {@inheritdoc}
-     */
+        /**
+         * {@inheritdoc}
+         */
     public function update(PersistentCollection $collection)
     {
         if ($collection->isDirty() && $collection->getSnapshot()) {

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Cache\Persister\Collection;
 

lib/Doctrine/ORM/Cache/Persister/Collection/AbstractCollectionPersister.php

Indentation +6 added lines, -6 removed lines

@@ -37,9 +37,9 @@ 
  */
 abstract class AbstractCollectionPersister implements CachedCollectionPersister
 {
-     /**
-     * @var \Doctrine\ORM\UnitOfWork
-     */
+        /**
+         * @var \Doctrine\ORM\UnitOfWork
+         */
     protected $uow;
 
     /**
@@ -67,9 +67,9 @@ 
      */
     protected $association;
 
-     /**
-     * @var array
-     */
+        /**
+         * @var array
+         */
     protected $queuedCache = [];
 
     /**

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Cache\Persister\Collection;
 
@@ -164,7 +164,7 @@ 
         $targetHydrator  = $targetPersister->getEntityHydrator();
 
         // Only preserve ordering if association configured it
-        if (! ($association instanceof ToManyAssociationMetadata && $association->getIndexedBy())) {
+        if ( ! ($association instanceof ToManyAssociationMetadata && $association->getIndexedBy())) {
             // Elements may be an array or a Collection
             $elements = \array_values($elements instanceof Collection ? $elements->getValues() : $elements);
         }

lib/Doctrine/ORM/Cache/CacheConfiguration.php

Indentation +2 added lines, -2 removed lines

@@ -73,7 +73,7 @@ 
      */
     public function getCacheLogger()
     {
-         return $this->cacheLogger;
+            return $this->cacheLogger;
     }
 
     /**
@@ -115,7 +115,7 @@ 
             );
         }
 
-         return $this->queryValidator;
+            return $this->queryValidator;
     }
 
     /**

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Cache;
 

tests/Doctrine/Tests/ORM/Functional/Ticket/GH6402Test.php

Unused Use Statements -2 removed lines

@@ -5,8 +5,6 @@
 use Doctrine\Tests\Models\Quote\Address;
 use Doctrine\Tests\Models\Quote\City;
 use Doctrine\Tests\Models\Quote\FullAddress;
-use Doctrine\Tests\Models\Quote\Group;
-use Doctrine\Tests\Models\Quote\Phone;
 use Doctrine\Tests\Models\Quote\User;
 use Doctrine\Tests\OrmFunctionalTestCase;
 

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
@@ -37,7 +37,7 @@ 
     {
         $id = $this->createAddress();
 
-        $addresses = $this->em->createQuery('SELECT a FROM ' . Address::class . ' a WHERE a.id = :id')
+        $addresses = $this->em->createQuery('SELECT a FROM '.Address::class.' a WHERE a.id = :id')
             ->setParameter('id', $id)
             ->getResult();
 
@@ -58,7 +58,7 @@ 
     {
         $id = $this->createFullAddress();
 
-        $addresses = $this->em->createQuery('SELECT a FROM ' . FullAddress::class . ' a WHERE a.id = :id')
+        $addresses = $this->em->createQuery('SELECT a FROM '.FullAddress::class.' a WHERE a.id = :id')
             ->setParameter('id', $id)
             ->getResult();
 

lib/Doctrine/ORM/Query/Parser.php

Doc Comments +3 added lines, -3 removed lines

@@ -413,7 +413,7 @@ 
      * declarations (from ... x join ... y join ... z ...) appear in the query
      * as the hydration process relies on that order for proper operation.
      *
-     * @param AST\SelectStatement|AST\DeleteStatement|AST\UpdateStatement $AST
+     * @param AST\SelectStatement $AST
      *
      * @return void
      */
@@ -1617,7 +1617,7 @@ 
      * accessible is "FROM", prohibiting an easy implementation without larger
      * changes.}
      *
-     * @return \Doctrine\ORM\Query\AST\SubselectIdentificationVariableDeclaration |
+     * @return AST\IdentificationVariableDeclaration |
      *         \Doctrine\ORM\Query\AST\IdentificationVariableDeclaration
      */
     public function SubselectIdentificationVariableDeclaration()
@@ -1755,7 +1755,7 @@ 
     /**
      * JoinAssociationDeclaration ::= JoinAssociationPathExpression ["AS"] AliasIdentificationVariable [IndexBy]
      *
-     * @return \Doctrine\ORM\Query\AST\JoinAssociationPathExpression
+     * @return AST\JoinAssociationDeclaration
      */
     public function JoinAssociationDeclaration()
     {

Unused Use Statements -1 removed lines

@@ -6,7 +6,6 @@
 
 use Doctrine\Common\Persistence\Mapping\MappingException;
 use Doctrine\ORM\Mapping\AssociationMetadata;
-use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Mapping\FieldMetadata;
 use Doctrine\ORM\Mapping\ToOneAssociationMetadata;
 use Doctrine\ORM\Query;

Spacing +15 added lines, -15 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Query;
 
@@ -471,7 +471,7 @@ 
         $tokenStr = substr($dql, (int) $token['position'], $length);
 
         // Building informative message
-        $message = 'line 0, col ' . $tokenPos . " near '" . $tokenStr . "': Error: " . $message;
+        $message = 'line 0, col '.$tokenPos." near '".$tokenStr."': Error: ".$message;
 
         throw QueryException::semanticalError(
             $message,
@@ -621,7 +621,7 @@ 
             // If the namespace is not given then assumes the first FROM entity namespace
             if (strpos($className, '\\') === false && ! class_exists($className) && strpos($fromClassName, '\\') !== false) {
                 $namespace  = substr($fromClassName, 0, strrpos($fromClassName, '\\'));
-                $fqcn       = $namespace . '\\' . $className;
+                $fqcn       = $namespace.'\\'.$className;
 
                 if (class_exists($fqcn)) {
                     $expression->className  = $fqcn;
@@ -670,13 +670,13 @@ 
                 }
 
                 $this->semanticalError(
-                    "There is no mapped field named '$field' on class " . $class->getClassName() . ".", $deferredItem['token']
+                    "There is no mapped field named '$field' on class ".$class->getClassName().".", $deferredItem['token']
                 );
             }
 
             if (array_intersect($class->identifier, $expr->partialFieldSet) != $class->identifier) {
                 $this->semanticalError(
-                    "The partial field selection of class " . $class->getClassName() . " must contain the identifier.",
+                    "The partial field selection of class ".$class->getClassName()." must contain the identifier.",
                     $deferredItem['token']
                 );
             }
@@ -745,9 +745,9 @@ 
             $property = $class->getProperty($field);
 
             // Check if field or association exists
-            if (! $property) {
+            if ( ! $property) {
                 $this->semanticalError(
-                    'Class ' . $class->getClassName() . ' has no field or association named ' . $field,
+                    'Class '.$class->getClassName().' has no field or association named '.$field,
                     $deferredItem['token']
                 );
             }
@@ -786,8 +786,8 @@ 
                 // Build the error message
                 $semanticalError  = 'Invalid PathExpression. ';
                 $semanticalError .= \count($expectedStringTypes) === 1
-                    ? 'Must be a ' . $expectedStringTypes[0] . '.'
-                    : implode(' or ', $expectedStringTypes) . ' expected.';
+                    ? 'Must be a '.$expectedStringTypes[0].'.'
+                    : implode(' or ', $expectedStringTypes).' expected.';
 
                 $this->semanticalError($semanticalError, $deferredItem['token']);
             }
@@ -956,7 +956,7 @@ 
 
             list($namespaceAlias, $simpleClassName) = explode(':', $this->lexer->token['value']);
 
-            $schemaName = $this->em->getConfiguration()->getEntityNamespace($namespaceAlias) . '\\' . $simpleClassName;
+            $schemaName = $this->em->getConfiguration()->getEntityNamespace($namespaceAlias).'\\'.$simpleClassName;
         }
 
         return $schemaName;
@@ -1041,7 +1041,7 @@ 
 
         if ( ! isset($this->queryComponents[$identVariable])) {
             $this->semanticalError(
-                'Identification Variable ' . $identVariable .' used in join path expression but was not defined before.'
+                'Identification Variable '.$identVariable.' used in join path expression but was not defined before.'
             );
         }
 
@@ -1054,8 +1054,8 @@ 
         $qComp = $this->queryComponents[$identVariable];
         $class = $qComp['metadata'];
 
-        if (! (($property = $class->getProperty($field)) !== null && $property instanceof AssociationMetadata)) {
-            $this->semanticalError('Class ' . $class->getClassName() . ' has no association named ' . $field);
+        if ( ! (($property = $class->getProperty($field)) !== null && $property instanceof AssociationMetadata)) {
+            $this->semanticalError('Class '.$class->getClassName().' has no association named '.$field);
         }
 
         return new AST\JoinAssociationPathExpression($identVariable, $field);
@@ -2477,7 +2477,7 @@ 
         // Peek beyond the matching closing parenthesis ')'
         $peek = $this->peekBeyondClosingParenthesis();
 
-        if (in_array($peek['value'], ["=",  "<", "<=", "<>", ">", ">=", "!="]) ||
+        if (in_array($peek['value'], ["=", "<", "<=", "<>", ">", ">=", "!="]) ||
             in_array($peek['type'], [Lexer::T_NOT, Lexer::T_BETWEEN, Lexer::T_LIKE, Lexer::T_IN, Lexer::T_IS, Lexer::T_EXISTS]) ||
             $this->isMathOperator($peek)) {
             $condPrimary->simpleConditionalExpression = $this->SimpleConditionalExpression();
@@ -2582,7 +2582,7 @@ 
             return $this->NullComparisonExpression();
         }
 
-        if ($token['type'] === Lexer::T_IS  && $lookahead['type'] === Lexer::T_EMPTY) {
+        if ($token['type'] === Lexer::T_IS && $lookahead['type'] === Lexer::T_EMPTY) {
             return $this->EmptyCollectionComparisonExpression();
         }
 

tests/Doctrine/Tests/ORM/Functional/OneToOneSelfReferentialAssociationTest.php

Doc Comments +8 added lines

@@ -161,8 +161,16 @@
     private $other2;
 
     public function getId() {return $this->id;}
+
+    /**
+     * @param MultiSelfReference $other1
+     */
     public function setOther1($other1) {$this->other1 = $other1;}
     public function getOther1() {return $this->other1;}
+
+    /**
+     * @param MultiSelfReference $other2
+     */
     public function setOther2($other2) {$this->other2 = $other2;}
     public function getOther2() {return $this->other2;}
 }

Spacing +6 added lines, -6 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Functional;
 
@@ -161,9 +161,9 @@ 
      */
     private $other2;
 
-    public function getId() {return $this->id;}
-    public function setOther1($other1) {$this->other1 = $other1;}
-    public function getOther1() {return $this->other1;}
-    public function setOther2($other2) {$this->other2 = $other2;}
-    public function getOther2() {return $this->other2;}
+    public function getId() {return $this->id; }
+    public function setOther1($other1) {$this->other1 = $other1; }
+    public function getOther1() {return $this->other1; }
+    public function setOther2($other2) {$this->other2 = $other2; }
+    public function getOther2() {return $this->other2; }
 }

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2692Test.php

Indentation +2 added lines, -2 removed lines

@@ -32,8 +32,8 @@
     public function testIsListenerCalledOnlyOnceOnPreFlush()
     {
         $listener = $this->getMockBuilder(DDC2692Listener::class)
-                         ->setMethods(['preFlush'])
-                         ->getMock();
+                            ->setMethods(['preFlush'])
+                            ->getMock();
 
         $listener->expects($this->once())->method('preFlush');
 

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Functional\Ticket;
 
@@ -26,7 +26,7 @@ 
                 $this->em->getClassMetadata(DDC2692Foo::class),
                 ]
             );
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             return;
         }
         $this->em->clear();

tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2359Test.php

Indentation +2 added lines, -2 removed lines

@@ -32,8 +32,8 @@
                                 ->getMock();
 
         $configuration = $this->getMockBuilder(Configuration::class)
-                              ->setMethods(['getMetadataDriverImpl'])
-                              ->getMock();
+                                ->setMethods(['getMetadataDriverImpl'])
+                                ->getMock();
 
         $connection = $this->createMock(Connection::class);
 

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Functional\Ticket;