doctrine / orm

tests/Doctrine/Tests/ORM/Query/CustomTreeWalkersJoinTest.php

Doc Comments +4 added lines

@@ -25,6 +25,10 @@
         $this->em = $this->getTestEntityManager();
     }
 
+    /**
+     * @param string $dqlToBeTested
+     * @param string $sqlToBeConfirmed
+     */
     public function assertSqlGeneration($dqlToBeTested, $sqlToBeConfirmed)
     {
         try {

Indentation +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
         try {
             $query = $this->em->createQuery($dqlToBeTested);
             $query->setHint(Query::HINT_CUSTOM_TREE_WALKERS, [CustomTreeWalkerJoin::class])
-                  ->useQueryCache(false);
+                    ->useQueryCache(false);
 
             $sqlGenerated = $query->getSql();
 

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Query;
 
@@ -36,7 +36,7 @@ 
 
             $query->free();
         } catch (\Exception $e) {
-            $this->fail($e->getMessage() . ' at "' . $e->getFile() . '" on line ' . $e->getLine());
+            $this->fail($e->getMessage().' at "'.$e->getFile().'" on line '.$e->getLine());
         }
 
         self::assertEquals($sqlToBeConfirmed, $sqlGenerated);
@@ -78,9 +78,9 @@ 
     {
         $rangeVariableDecl       = $identificationVariableDecl->rangeVariableDeclaration;
         $joinAssocPathExpression = new Query\AST\JoinAssociationPathExpression($rangeVariableDecl->aliasIdentificationVariable, 'address');
-        $joinAssocDeclaration    = new Query\AST\JoinAssociationDeclaration($joinAssocPathExpression, $rangeVariableDecl->aliasIdentificationVariable . 'a', null);
+        $joinAssocDeclaration    = new Query\AST\JoinAssociationDeclaration($joinAssocPathExpression, $rangeVariableDecl->aliasIdentificationVariable.'a', null);
         $join                    = new Query\AST\Join(Query\AST\Join::JOIN_TYPE_LEFT, $joinAssocDeclaration);
-        $selectExpression        = new Query\AST\SelectExpression($rangeVariableDecl->aliasIdentificationVariable . 'a', null, false);
+        $selectExpression        = new Query\AST\SelectExpression($rangeVariableDecl->aliasIdentificationVariable.'a', null, false);
 
         $identificationVariableDecl->joins[]                = $join;
         $selectStatement->selectClause->selectExpressions[] = $selectExpression;
@@ -89,7 +89,7 @@ 
         $userMetadata    = $entityManager->getClassMetadata(CmsUser::class);
         $addressMetadata = $entityManager->getClassMetadata(CmsAddress::class);
 
-        $this->setQueryComponent($rangeVariableDecl->aliasIdentificationVariable . 'a',
+        $this->setQueryComponent($rangeVariableDecl->aliasIdentificationVariable.'a',
             [
                 'metadata'     => $addressMetadata,
                 'parent'       => $rangeVariableDecl->aliasIdentificationVariable,

tests/Doctrine/Tests/ORM/QueryBuilderTest.php

Doc Comments +3 added lines

@@ -37,6 +37,9 @@
         $this->em = $this->getTestEntityManager();
     }
 
+    /**
+     * @param string $expectedDql
+     */
     protected function assertValidQueryBuilder(QueryBuilder $qb, $expectedDql)
     {
         $dql = $qb->getDQL();

Indentation +37 added lines, -37 removed lines

@@ -274,12 +274,12 @@ 
     {
         $qb = $this->em->createQueryBuilder();
         $qb->select('u')
-           ->from(CmsUser::class, 'u')
-           ->where('u.id = :uid')
-           ->orWhere('u.id = :uid2')
-           ->andWhere('u.id = :uid3')
-           ->orWhere('u.name = :name1', 'u.name = :name2')
-           ->andWhere('u.name <> :noname');
+            ->from(CmsUser::class, 'u')
+            ->where('u.id = :uid')
+            ->orWhere('u.id = :uid2')
+            ->andWhere('u.id = :uid3')
+            ->orWhere('u.name = :name1', 'u.name = :name2')
+            ->andWhere('u.name <> :noname');
 
         self::assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE (((u.id = :uid OR u.id = :uid2) AND u.id = :uid3) OR u.name = :name1 OR u.name = :name2) AND u.name <> :noname');
     }
@@ -288,9 +288,9 @@ 
     {
         $qb = $this->em->createQueryBuilder();
         $qb->select('u')
-           ->from(CmsUser::class, 'u')
-           ->where('u.id = :uid')
-           ->andWhere($qb->expr()->in('u.id', [1, 2, 3]));
+            ->from(CmsUser::class, 'u')
+            ->where('u.id = :uid')
+            ->andWhere($qb->expr()->in('u.id', [1, 2, 3]));
 
         self::assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = :uid AND u.id IN(1, 2, 3)');
     }
@@ -299,9 +299,9 @@ 
     {
         $qb = $this->em->createQueryBuilder();
         $qb->select('u')
-           ->from(CmsUser::class, 'u')
-           ->where('u.id = :uid')
-           ->orWhere($qb->expr()->in('u.id', [1, 2, 3]));
+            ->from(CmsUser::class, 'u')
+            ->where('u.id = :uid')
+            ->orWhere($qb->expr()->in('u.id', [1, 2, 3]));
 
         self::assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = :uid OR u.id IN(1, 2, 3)');
     }
@@ -310,9 +310,9 @@ 
     {
         $qb = $this->em->createQueryBuilder();
         $qb->select('u')
-           ->from(CmsUser::class, 'u')
-           ->where('u.id = :uid')
-           ->andWhere($qb->expr()->notIn('u.id', [1, 2, 3]));
+            ->from(CmsUser::class, 'u')
+            ->where('u.id = :uid')
+            ->andWhere($qb->expr()->notIn('u.id', [1, 2, 3]));
 
         self::assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = :uid AND u.id NOT IN(1, 2, 3)');
     }
@@ -321,9 +321,9 @@ 
     {
         $qb = $this->em->createQueryBuilder();
         $qb->select('u')
-           ->from(CmsUser::class, 'u')
-           ->where('u.id = :uid')
-           ->orWhere($qb->expr()->notIn('u.id', [1, 2, 3]));
+            ->from(CmsUser::class, 'u')
+            ->where('u.id = :uid')
+            ->orWhere($qb->expr()->notIn('u.id', [1, 2, 3]));
 
         self::assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = :uid OR u.id NOT IN(1, 2, 3)');
     }
@@ -619,8 +619,8 @@ 
     {
         $qb = $this->em->createQueryBuilder();
         $qb->select('u')
-           ->from(CmsUser::class, 'u')
-           ->where($qb->expr()->orX('u.username = :username', 'u.username = :username2'));
+            ->from(CmsUser::class, 'u')
+            ->where($qb->expr()->orX('u.username = :username', 'u.username = :username2'));
 
         $parameters = new ArrayCollection();
         $parameters->add(new Parameter('username', 'jwage'));
@@ -636,8 +636,8 @@ 
     {
         $qb = $this->em->createQueryBuilder();
         $qb->select('u')
-           ->from(CmsUser::class, 'u')
-           ->where('u.id = :id');
+            ->from(CmsUser::class, 'u')
+            ->where('u.id = :id');
 
         $parameters = new ArrayCollection();
         $parameters->add(new Parameter('id', 1));
@@ -686,8 +686,8 @@ 
     {
         $qb = $this->em->createQueryBuilder();
         $qb->select('u')
-           ->from(CmsUser::class, 'u')
-           ->orWhere('u.id = :uid', $qb->expr()->eq('u.id', ':uid2'));
+            ->from(CmsUser::class, 'u')
+            ->orWhere('u.id = :uid', $qb->expr()->eq('u.id', ':uid2'));
 
         self::assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = :uid OR u.id = :uid2');
     }
@@ -700,8 +700,8 @@ 
         $orExpr->add($qb->expr()->in('u.id', [1]));
 
         $qb->select('u')
-           ->from(CmsUser::class, 'u')
-           ->where($orExpr);
+            ->from(CmsUser::class, 'u')
+            ->where($orExpr);
 
         self::assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = :uid3 OR u.id IN(1)');
     }
@@ -710,8 +710,8 @@ 
     {
         $qb = $this->em->createQueryBuilder();
         $qb->select('u')
-           ->from(CmsUser::class, 'u')
-           ->where($qb->expr()->in('u.name', ['one', 'two', 'three']));
+            ->from(CmsUser::class, 'u')
+            ->where($qb->expr()->in('u.name', ['one', 'two', 'three']));
 
         self::assertValidQueryBuilder($qb, "SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.name IN('one', 'two', 'three')");
 
@@ -725,8 +725,8 @@ 
         $qb = $this->em->createQueryBuilder();
         $expr = $this->em->getExpressionBuilder();
         $qb->select('u')
-           ->from(CmsUser::class, 'u')
-           ->where($expr->in('u.name', [$expr->literal('one'), $expr->literal('two'), $expr->literal('three')]));
+            ->from(CmsUser::class, 'u')
+            ->where($expr->in('u.name', [$expr->literal('one'), $expr->literal('two'), $expr->literal('three')]));
 
         self::assertValidQueryBuilder($qb, "SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.name IN('one', 'two', 'three')");
 
@@ -744,8 +744,8 @@ 
 
         $qb = $this->em->createQueryBuilder();
         $qb->select('u')
-           ->from(CmsUser::class, 'u')
-           ->where($orExpr);
+            ->from(CmsUser::class, 'u')
+            ->where($orExpr);
 
         self::assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = :uid3 OR NOT(u.id IN(1))');
     }
@@ -756,8 +756,8 @@ 
         $expr = $this->em->getExpressionBuilder();
 
         $qb->select('u')
-           ->from(CmsUser::class, 'u')
-           ->where($expr->gt('u.id', $expr->all('select a.id from Doctrine\Tests\Models\CMS\CmsArticle a')));
+            ->from(CmsUser::class, 'u')
+            ->where($expr->gt('u.id', $expr->all('select a.id from Doctrine\Tests\Models\CMS\CmsArticle a')));
 
         self::assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id > ALL(select a.id from Doctrine\Tests\Models\CMS\CmsArticle a)');
 
@@ -1123,9 +1123,9 @@ 
     public function testRebuildsFromParts()
     {
         $qb = $this->em->createQueryBuilder()
-          ->select('u')
-          ->from(CmsUser::class, 'u')
-          ->join('u.article', 'a');
+            ->select('u')
+            ->from(CmsUser::class, 'u')
+            ->join('u.article', 'a');
 
         $dqlParts = $qb->getDQLParts();
         $dql = $qb->getDQL();

Spacing +7 added lines, -7 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM;
 
@@ -549,7 +549,7 @@ 
         $qb = $this->em->createQueryBuilder();
         $qb->select('u')
             ->from(CmsUser::class, 'u')
-            ->join('u.article','a');
+            ->join('u.article', 'a');
 
         $criteria = new Criteria();
         $criteria->orderBy(['a.field' => Criteria::DESC]);
@@ -826,7 +826,7 @@ 
             ->from(CmsUser::class, 'u')
             ->where('u.username = ?1')->orderBy('u.username');
 
-        self::assertEquals('u.username = ?1', (string)$qb->getDQLPart('where'));
+        self::assertEquals('u.username = ?1', (string) $qb->getDQLPart('where'));
         self::assertCount(1, $qb->getDQLPart('orderBy'));
 
         $qb->resetDQLPart('where')->resetDQLPart('orderBy');
@@ -890,7 +890,7 @@ 
     {
         $qb = $this->em->createQueryBuilder();
         $qb->select('alias1')->from(CmsUser::class, 'alias1');
-        $qb->join('alias1.articles','alias2');
+        $qb->join('alias1.articles', 'alias2');
 
         $criteria = new Criteria();
         $criteria->where($criteria->expr()->eq('field', 'value1'));
@@ -910,7 +910,7 @@ 
     {
         $qb = $this->em->createQueryBuilder();
         $qb->select('alias1')->from(CmsUser::class, 'alias1');
-        $qb->join('alias1.articles','alias2');
+        $qb->join('alias1.articles', 'alias2');
 
         $criteria = new Criteria();
         $criteria->where($criteria->expr()->eq('alias1.field', 'value1'));
@@ -930,7 +930,7 @@ 
     {
         $qb = $this->em->createQueryBuilder();
         $qb->select('alias1')->from(CmsUser::class, 'alias1');
-        $qb->join('alias1.articles','alias2');
+        $qb->join('alias1.articles', 'alias2');
 
         $criteria = new Criteria();
         $criteria->where($criteria->expr()->eq('alias1.field', 'value1'));
@@ -1046,7 +1046,7 @@ 
     {
         $qb = $this->em->createQueryBuilder()
             ->add('select', 'u')
-            ->add('from', CmsUser::class . ' u');
+            ->add('from', CmsUser::class.' u');
 
         self::assertEquals('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u', $qb->getDQL());
     }

tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php

Doc Comments +2 added lines, -1 removed lines

@@ -213,6 +213,7 @@ 
     }
 
     /**
+     * @param string|false $columnPrefix
      * @return ClassMetadata
      */
     private function generateIsbnEmbeddableFixture(array $embeddedClasses = [], $columnPrefix = null)
@@ -1311,7 +1312,7 @@ 
 
     /**
      * @param string $type
-     * @param \ReflectionProperty $method
+     * @param \ReflectionMethod $method
      */
     private function assertPhpDocParamType($type, \ReflectionMethod $method)
     {

Indentation +6 added lines, -6 removed lines

@@ -677,7 +677,7 @@ 
         $this->generator->writeEntityClass($metadata, $this->tmpDir);
 
         $filename = $this->tmpDir . DIRECTORY_SEPARATOR
-                  . $this->namespace . DIRECTORY_SEPARATOR . 'DDC1784Entity.php';
+                    . $this->namespace . DIRECTORY_SEPARATOR . 'DDC1784Entity.php';
 
         self::assertFileExists($filename);
 
@@ -761,9 +761,9 @@ 
 
     }
 
-     /**
-     * @group DDC-2172
-     */
+        /**
+         * @group DDC-2172
+         */
     public function testGetInheritanceTypeString()
     {
         $reflection = new \ReflectionClass('\Doctrine\ORM\Mapping\ClassMetadata');
@@ -791,8 +791,8 @@ 
     }
 
     /**
-    * @group DDC-2172
-    */
+     * @group DDC-2172
+     */
     public function testGetChangeTrackingPolicyString()
     {
         $reflection = new \ReflectionClass('\Doctrine\ORM\Mapping\ClassMetadata');

Unused Use Statements -1 removed lines

@@ -17,7 +17,6 @@
 use Doctrine\Tests\Models\DDC2372\DDC2372Admin;
 use Doctrine\Tests\Models\DDC2372\DDC2372User;
 use Doctrine\Tests\OrmTestCase;
-use SebastianBergmann\Environment\Runtime;
 
 class EntityGeneratorTest extends OrmTestCase
 {

Spacing +41 added lines, -41 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Tools;
 
@@ -53,7 +53,7 @@ 
         $this->namespace = uniqid("doctrine_", false);
         $this->tmpDir = sys_get_temp_dir();
 
-        mkdir($this->tmpDir . \DIRECTORY_SEPARATOR . $this->namespace);
+        mkdir($this->tmpDir.\DIRECTORY_SEPARATOR.$this->namespace);
 
         $this->generator = new EntityGenerator();
 
@@ -66,7 +66,7 @@ 
 
     public function tearDown()
     {
-        $ri = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($this->tmpDir . '/' . $this->namespace));
+        $ri = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($this->tmpDir.'/'.$this->namespace));
 
         foreach ($ri AS $file) {
             /* @var $file \SplFileInfo */
@@ -75,7 +75,7 @@ 
             }
         }
 
-        rmdir($this->tmpDir . '/' . $this->namespace);
+        rmdir($this->tmpDir.'/'.$this->namespace);
     }
 
     /**
@@ -85,9 +85,9 @@ 
      */
     public function generateBookEntityFixture(array $embeddedClasses = [])
     {
-        $metadata = new ClassMetadata($this->namespace . '\EntityGeneratorBook', $this->staticMetadataBuildingContext);
+        $metadata = new ClassMetadata($this->namespace.'\EntityGeneratorBook', $this->staticMetadataBuildingContext);
 
-        $metadata->setCustomRepositoryClassName($this->namespace . '\EntityGeneratorBookRepository');
+        $metadata->setCustomRepositoryClassName($this->namespace.'\EntityGeneratorBookRepository');
 
         $tableMetadata = new Mapping\TableMetadata();
 
@@ -206,7 +206,7 @@ 
 
     private function generateEntityTypeFixture(array $field)
     {
-        $metadata = new ClassMetadata($this->namespace . '\EntityType', $this->staticMetadataBuildingContext);
+        $metadata = new ClassMetadata($this->namespace.'\EntityType', $this->staticMetadataBuildingContext);
 
         $tableMetadata = new Mapping\TableMetadata();
         $tableMetadata->setName('entity_type');
@@ -239,7 +239,7 @@ 
      */
     private function generateIsbnEmbeddableFixture(array $embeddedClasses = [], $columnPrefix = null)
     {
-        $metadata = new ClassMetadata($this->namespace . '\EntityGeneratorIsbn', $this->staticMetadataBuildingContext);
+        $metadata = new ClassMetadata($this->namespace.'\EntityGeneratorIsbn', $this->staticMetadataBuildingContext);
 
         $metadata->isEmbeddedClass = true;
 
@@ -298,7 +298,7 @@ 
      */
     private function generateTestEmbeddableFixture()
     {
-        $metadata = new ClassMetadata($this->namespace . '\EntityGeneratorTestEmbeddable', $this->staticMetadataBuildingContext);
+        $metadata = new ClassMetadata($this->namespace.'\EntityGeneratorTestEmbeddable', $this->staticMetadataBuildingContext);
 
         $metadata->isEmbeddedClass = true;
 
@@ -341,7 +341,7 @@ 
     private function loadEntityClass(ClassMetadata $metadata)
     {
         $className = basename(str_replace('\\', '/', $metadata->getClassName()));
-        $path      = $this->tmpDir . '/' . $this->namespace . '/' . $className . '.php';
+        $path      = $this->tmpDir.'/'.$this->namespace.'/'.$className.'.php';
 
         self::assertFileExists($path);
 
@@ -492,7 +492,7 @@ 
 
         $this->generator->writeEntityClass($metadata, $this->tmpDir);
 
-        self::assertFileExists($this->tmpDir . "/" . $this->namespace . "/EntityGeneratorBook.php~");
+        self::assertFileExists($this->tmpDir."/".$this->namespace."/EntityGeneratorBook.php~");
 
         $book = $this->newInstance($metadata);
         $reflClass = new \ReflectionClass($metadata->getClassName());
@@ -543,7 +543,7 @@ 
         self::assertPhpDocReturnType('\Doctrine\Tests\ORM\Tools\EntityGeneratorAuthor|null', new \ReflectionMethod($book, 'getAuthor'));
         self::assertPhpDocParamType('\Doctrine\Tests\ORM\Tools\EntityGeneratorAuthor|null', new \ReflectionMethod($book, 'setAuthor'));
 
-        $expectedClassName = '\\' . $embeddedMetadata->getClassName();
+        $expectedClassName = '\\'.$embeddedMetadata->getClassName();
 
         self::assertPhpDocVarType($expectedClassName, new \ReflectionProperty($book, 'isbn'));
         self::assertPhpDocReturnType($expectedClassName, new \ReflectionMethod($book, 'getIsbn'));
@@ -647,7 +647,7 @@ 
      */
     public function testMappedSuperclassAnnotationGeneration()
     {
-        $metadata = new ClassMetadata($this->namespace . '\EntityGeneratorBook', $this->staticMetadataBuildingContext);
+        $metadata = new ClassMetadata($this->namespace.'\EntityGeneratorBook', $this->staticMetadataBuildingContext);
 
         $metadata->isMappedSuperclass = true;
 
@@ -684,7 +684,7 @@ 
      */
     public function testGenerateEntityWithSequenceGenerator()
     {
-        $metadata = new ClassMetadata($this->namespace . '\DDC1784Entity', $this->staticMetadataBuildingContext);
+        $metadata = new ClassMetadata($this->namespace.'\DDC1784Entity', $this->staticMetadataBuildingContext);
         $metadata->setTable(new Mapping\TableMetadata('ddc1784_entity'));
 
         $fieldMetadata = new Mapping\FieldMetadata('id');
@@ -702,8 +702,8 @@ 
 
         $this->generator->writeEntityClass($metadata, $this->tmpDir);
 
-        $filename = $this->tmpDir . DIRECTORY_SEPARATOR
-                  . $this->namespace . DIRECTORY_SEPARATOR . 'DDC1784Entity.php';
+        $filename = $this->tmpDir.DIRECTORY_SEPARATOR
+                  . $this->namespace.DIRECTORY_SEPARATOR.'DDC1784Entity.php';
 
         self::assertFileExists($filename);
 
@@ -723,7 +723,7 @@ 
      */
     public function testGenerateEntityWithMultipleInverseJoinColumns()
     {
-        $metadata = new ClassMetadata($this->namespace . '\DDC2079Entity', $this->staticMetadataBuildingContext);
+        $metadata = new ClassMetadata($this->namespace.'\DDC2079Entity', $this->staticMetadataBuildingContext);
         $metadata->setTable(new Mapping\TableMetadata('ddc2079_entity'));
 
         $fieldMetadata = new Mapping\FieldMetadata('id');
@@ -763,14 +763,14 @@ 
         $association = new Mapping\ManyToManyAssociationMetadata('centroCustos');
 
         $association->setJoinTable($joinTable);
-        $association->setTargetEntity($this->namespace . '\\DDC2079CentroCusto');
+        $association->setTargetEntity($this->namespace.'\\DDC2079CentroCusto');
 
         $metadata->addProperty($association);
 
         $this->generator->writeEntityClass($metadata, $this->tmpDir);
 
-        $filename = $this->tmpDir . DIRECTORY_SEPARATOR
-            . $this->namespace . DIRECTORY_SEPARATOR . 'DDC2079Entity.php';
+        $filename = $this->tmpDir.DIRECTORY_SEPARATOR
+            . $this->namespace.DIRECTORY_SEPARATOR.'DDC2079Entity.php';
 
         self::assertFileExists($filename);
 
@@ -801,7 +801,7 @@ 
         $method->setAccessible(true);
 
         foreach ($constants as $name => $value) {
-            if( ! preg_match($pattern, $name)) {
+            if ( ! preg_match($pattern, $name)) {
                 continue;
             }
 
@@ -830,7 +830,7 @@ 
         $method->setAccessible(true);
 
         foreach ($constants as $name => $value) {
-            if( ! preg_match($pattern, $name)) {
+            if ( ! preg_match($pattern, $name)) {
                 continue;
             }
 
@@ -859,7 +859,7 @@ 
         $method->setAccessible(true);
 
         foreach ($constants as $name => $value) {
-            if( ! preg_match($pattern, $name)) {
+            if ( ! preg_match($pattern, $name)) {
                 continue;
             }
 
@@ -883,7 +883,7 @@ 
     public function testEntityTypeAlias(array $field)
     {
         $metadata   = $this->generateEntityTypeFixture($field);
-        $path       = $this->tmpDir . '/'. $this->namespace . '/EntityType.php';
+        $path       = $this->tmpDir.'/'.$this->namespace.'/EntityType.php';
 
         self::assertFileExists($path);
         require_once $path;
@@ -896,8 +896,8 @@ 
         $type   = $field['phpType'];
         $name   = $field['fieldName'];
         $value  = $field['value'];
-        $getter = "get" . ucfirst($name);
-        $setter = "set" . ucfirst($name);
+        $getter = "get".ucfirst($name);
+        $setter = "set".ucfirst($name);
 
         self::assertPhpDocVarType($type, $reflClass->getProperty($name));
         self::assertPhpDocParamType($type, $reflClass->getMethod($setter));
@@ -920,13 +920,13 @@ 
         $metadata = $cmf->getMetadataFor(get_class($user));
 
         // @todo guilhermeblanco Fix this test as changing Entity class should never be allowed.
-        $metadata->setClassName($this->namespace . "\DDC2372User");
+        $metadata->setClassName($this->namespace."\DDC2372User");
 
         $this->generator->writeEntityClass($metadata, $this->tmpDir);
 
-        self::assertFileExists($this->tmpDir . "/" . $this->namespace . "/DDC2372User.php");
+        self::assertFileExists($this->tmpDir."/".$this->namespace."/DDC2372User.php");
 
-        require $this->tmpDir . "/" . $this->namespace . "/DDC2372User.php";
+        require $this->tmpDir."/".$this->namespace."/DDC2372User.php";
 
         $reflClass = new \ReflectionClass($metadata->getClassName());
 
@@ -948,12 +948,12 @@ 
         $metadata = $cmf->getMetadataFor(get_class($user));
 
         // @todo guilhermeblanco Fix this test as changing Entity class should never be allowed.
-        $metadata->setClassName($this->namespace . "\DDC2372Admin");
+        $metadata->setClassName($this->namespace."\DDC2372Admin");
 
         $this->generator->writeEntityClass($metadata, $this->tmpDir);
 
-        self::assertFileExists($this->tmpDir . "/" . $this->namespace . "/DDC2372Admin.php");
-        require $this->tmpDir . "/" . $this->namespace . "/DDC2372Admin.php";
+        self::assertFileExists($this->tmpDir."/".$this->namespace."/DDC2372Admin.php");
+        require $this->tmpDir."/".$this->namespace."/DDC2372Admin.php";
 
         $reflClass = new \ReflectionClass($metadata->getClassName());
 
@@ -973,22 +973,22 @@ 
         $cmf->setEntityManager($em);
 
         $ns     = $this->namespace;
-        $nsdir  = $this->tmpDir . '/' . $ns;
+        $nsdir  = $this->tmpDir.'/'.$ns;
 
         // Dump DDC1590User into temp file
         $content = str_replace(
             'namespace Doctrine\Tests\Models\DDC1590',
-            'namespace ' . $ns,
-            file_get_contents(__DIR__ . '/../../Models/DDC1590/DDC1590User.php')
+            'namespace '.$ns,
+            file_get_contents(__DIR__.'/../../Models/DDC1590/DDC1590User.php')
         );
 
-        $fname = $nsdir . "/DDC1590User.php";
+        $fname = $nsdir."/DDC1590User.php";
         file_put_contents($fname, $content);
 
         // Require DDC1590User
         require $fname;
 
-        $metadata = $cmf->getMetadataFor($ns . '\DDC1590User');
+        $metadata = $cmf->getMetadataFor($ns.'\DDC1590User');
         $this->generator->writeEntityClass($metadata, $this->tmpDir);
 
         // class DDC1590User extends DDC1590Entity { ... }
@@ -996,13 +996,13 @@ 
 
         // class _DDC1590User extends DDC1590Entity { ... }
         $source2    = str_replace('class DDC1590User', 'class _DDC1590User', $source);
-        $fname2     = $nsdir . "/_DDC1590User.php";
+        $fname2     = $nsdir."/_DDC1590User.php";
         file_put_contents($fname2, $source2);
         require $fname2;
 
         // class __DDC1590User { ... }
         $source3    = str_replace('class DDC1590User extends DDC1590Entity', 'class __DDC1590User', $source);
-        $fname3     = $nsdir . "/__DDC1590User.php";
+        $fname3     = $nsdir."/__DDC1590User.php";
         file_put_contents($fname3, $source3);
         require $fname3;
 
@@ -1165,7 +1165,7 @@ 
         $this->loadEntityClass($metadata);
 
         $className = basename(str_replace('\\', '/', $metadata->getClassName()));
-        $path = $this->tmpDir . '/' . $this->namespace . '/' . $className . '.php';
+        $path = $this->tmpDir.'/'.$this->namespace.'/'.$className.'.php';
         $classTest = file_get_contents($path);
 
         $this->generator->setRegenerateEntityIfExists(true);
@@ -1174,7 +1174,7 @@ 
         $this->generator->writeEntityClass($metadata, $this->tmpDir);
         $classNew = file_get_contents($path);
 
-        self::assertSame($classTest,$classNew);
+        self::assertSame($classTest, $classNew);
     }
 
     /**

tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php

Doc Comments +9 added lines, -1 removed lines

@@ -57,6 +57,9 @@ 
         return EntityManagerMock::create($connection, $config, $eventManager);
     }
 
+    /**
+     * @param string $path
+     */
     protected function createMetadataDriver($type, $path)
     {
         $mappingDriver = [
@@ -75,6 +78,9 @@ 
         return $driver;
     }
 
+    /**
+     * @param EntityManagerMock $em
+     */
     protected function createClassMetadataFactory($em, $type)
     {
         $factory = ($type === 'annotation')
@@ -294,7 +300,6 @@ 
 
     /**
      * @depends testOneToManyAssociationsAreExported
-     * @param ClassMetadata $metadata
      */
     public function testManyToManyAssociationsAreExported($class)
     {
@@ -406,6 +411,9 @@ 
 #        $this->deleteDirectory(__DIR__ . '/export/'.$this->getType());
     }
 
+    /**
+     * @param string $path
+     */
     protected function deleteDirectory($path)
     {
         if (is_file($path)) {

Unused Use Statements -1 removed lines

@@ -12,7 +12,6 @@
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Mapping\Driver\AnnotationDriver;
 use Doctrine\ORM\Mapping\Driver\XmlDriver;
-use Doctrine\ORM\Mapping\Driver\PHPDriver;
 use Doctrine\ORM\Mapping\ManyToManyAssociationMetadata;
 use Doctrine\ORM\Mapping\OneToManyAssociationMetadata;
 use Doctrine\ORM\Proxy\Factory\ProxyFactory;

Spacing +11 added lines, -11 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Tools\Export;
 
@@ -66,7 +66,7 @@ 
             'xml'        => XmlDriver::class,
         ];
 
-        self::assertArrayHasKey($type, $mappingDriver, "There is no metadata driver for the type '" . $type . "'.");
+        self::assertArrayHasKey($type, $mappingDriver, "There is no metadata driver for the type '".$type."'.");
 
         $class  = $mappingDriver[$type];
         $driver = ($type === 'annotation')
@@ -89,10 +89,10 @@ 
 
     public function testExportDirectoryAndFilesAreCreated()
     {
-        $this->deleteDirectory(__DIR__ . '/export/'.$this->getType());
+        $this->deleteDirectory(__DIR__.'/export/'.$this->getType());
 
         $type = $this->getType();
-        $metadataDriver = $this->createMetadataDriver($type, __DIR__ . '/' . $type);
+        $metadataDriver = $this->createMetadataDriver($type, __DIR__.'/'.$type);
         $em = $this->createEntityManager($metadataDriver);
         $cmf = $this->createClassMetadataFactory($em, $type);
         $metadata = $cmf->getAllMetadata();
@@ -104,7 +104,7 @@ 
 
         $type = $this->getType();
         $cme = new ClassMetadataExporter();
-        $exporter = $cme->getExporter($type, __DIR__ . '/export/' . $type);
+        $exporter = $cme->getExporter($type, __DIR__.'/export/'.$type);
 
         if ($type === 'annotation') {
             $exporter->setEntityGenerator(new EntityGenerator());
@@ -116,9 +116,9 @@ 
         $exporter->export();
 
         if ($type == 'annotation') {
-            self::assertFileExists(__DIR__ . '/export/' . $type . '/'.str_replace('\\', '/', ExportedUser::class).$this->extension);
+            self::assertFileExists(__DIR__.'/export/'.$type.'/'.str_replace('\\', '/', ExportedUser::class).$this->extension);
         } else {
-            self::assertFileExists(__DIR__ . '/export/' . $type . '/Doctrine.Tests.ORM.Tools.Export.ExportedUser'.$this->extension);
+            self::assertFileExists(__DIR__.'/export/'.$type.'/Doctrine.Tests.ORM.Tools.Export.ExportedUser'.$this->extension);
         }
     }
 
@@ -129,7 +129,7 @@ 
     {
         $type = $this->getType();
 
-        $metadataDriver = $this->createMetadataDriver($type, __DIR__ . '/export/' . $type);
+        $metadataDriver = $this->createMetadataDriver($type, __DIR__.'/export/'.$type);
         $em = $this->createEntityManager($metadataDriver);
         $cmf = $this->createClassMetadataFactory($em, $type);
         $metadata = $cmf->getAllMetadata();
@@ -383,7 +383,7 @@ 
 
         if ($type === 'xml') {
             $xml = simplexml_load_string(
-                file_get_contents(__DIR__ . '/export/' . $type . '/Doctrine.Tests.ORM.Tools.Export.ExportedUser.dcm.xml')
+                file_get_contents(__DIR__.'/export/'.$type.'/Doctrine.Tests.ORM.Tools.Export.ExportedUser.dcm.xml')
             );
 
             $xml->registerXPathNamespace("d", "http://doctrine-project.org/schemas/orm/doctrine-mapping");
@@ -430,10 +430,10 @@ 
         }
 
         if (is_dir($path)) {
-            $files = glob(rtrim($path,'/').'/*');
+            $files = glob(rtrim($path, '/').'/*');
 
             if (is_array($files)) {
-                foreach ($files as $file){
+                foreach ($files as $file) {
                     $this->deleteDirectory($file);
                 }
             }

tests/Doctrine/Tests/ORM/UnitOfWorkTest.php

Doc Comments +12 added lines

@@ -654,6 +654,9 @@ 
         return $this->items;
     }
 
+    /**
+     * @param string $value
+     */
     public function setTransient($value) {
         if ($value != $this->transient) {
             $this->onPropertyChanged('transient', $this->transient, $value);
@@ -665,6 +668,9 @@ 
         return $this->data;
     }
 
+    /**
+     * @param string $data
+     */
     public function setData($data) {
         if ($data != $this->data) {
             $this->onPropertyChanged('data', $this->data, $data);
@@ -677,6 +683,9 @@ 
         $this->listeners[] = $listener;
     }
 
+    /**
+     * @param string $propName
+     */
     protected function onPropertyChanged($propName, $oldValue, $newValue) {
         if ($this->listeners) {
             foreach ($this->listeners as $listener) {
@@ -707,6 +716,9 @@ 
         return $this->owner;
     }
 
+    /**
+     * @param NotifyChangedEntity|null $owner
+     */
     public function setOwner($owner) {
         $this->owner = $owner;
     }

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM;
 
@@ -450,7 +450,7 @@ 
             'empty string, single field'     => [$emptyString, ''],
             'non-empty string, single field' => [$nonEmptyString, $nonEmptyString->id],
             'empty strings, two fields'      => [$emptyStrings, ' '],
-            'non-empty strings, two fields'  => [$nonEmptyStrings, $nonEmptyStrings->id1 . ' ' . $nonEmptyStrings->id2],
+            'non-empty strings, two fields'  => [$nonEmptyStrings, $nonEmptyStrings->id1.' '.$nonEmptyStrings->id2],
             'boolean true'                   => [$booleanTrue, '1'],
             'boolean false'                  => [$booleanFalse, ''],
         ];
@@ -481,7 +481,7 @@ 
 
     public function entitiesWithInvalidIdentifiersProvider()
     {
-        $firstNullString  = new EntityWithCompositeStringIdentifier();
+        $firstNullString = new EntityWithCompositeStringIdentifier();
 
         $firstNullString->id2 = uniqid('id2', true);
 

Unused Use Statements -1 removed lines

@@ -9,7 +9,6 @@
 use Doctrine\Common\NotifyPropertyChanged;
 use Doctrine\Common\PropertyChangedListener;
 use Doctrine\ORM\Annotation as ORM;
-use Doctrine\ORM\Events;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Mapping\ClassMetadataBuildingContext;
 use Doctrine\ORM\Mapping\ClassMetadataFactory;

tests/Doctrine/Tests/OrmTestCase.php

Doc Comments +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
     protected $secondLevelCacheDriverImpl = null;
 
     /**
-     * @param array $paths
+     * @param string[] $paths
      *
      * @return \Doctrine\ORM\Mapping\Driver\AnnotationDriver
      */

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests;
 
@@ -67,7 +67,7 @@ 
     {
         $reader = new Annotations\CachedReader(new Annotations\AnnotationReader(), new ArrayCache());
 
-        Annotations\AnnotationRegistry::registerFile(__DIR__ . "/../../../lib/Doctrine/ORM/Annotation/DoctrineAnnotations.php");
+        Annotations\AnnotationRegistry::registerFile(__DIR__."/../../../lib/Doctrine/ORM/Annotation/DoctrineAnnotations.php");
 
         return new AnnotationDriver($reader, (array) $paths);
     }
@@ -106,7 +106,7 @@ 
         $config->setAutoGenerateProxyClasses(ProxyFactory::AUTOGENERATE_EVAL);
         $config->setMetadataDriverImpl(
             $config->newDefaultAnnotationDriver([
-                realpath(__DIR__ . '/Models/Cache')
+                realpath(__DIR__.'/Models/Cache')
             ])
         );
 

tests/Doctrine/Tests/TestInit.php

Spacing +9 added lines, -9 removed lines

@@ -2,28 +2,28 @@
 /*
  * This file bootstraps the test environment.
  */
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests;
 
 error_reporting(E_ALL | E_STRICT);
 date_default_timezone_set('UTC');
 
-if (file_exists(__DIR__ . '/../../../vendor/autoload.php')) {
+if (file_exists(__DIR__.'/../../../vendor/autoload.php')) {
     // dependencies were installed via composer - this is the main project
-    require __DIR__ . '/../../../vendor/autoload.php';
-} elseif (file_exists(__DIR__ . '/../../../../../autoload.php')) {
+    require __DIR__.'/../../../vendor/autoload.php';
+} elseif (file_exists(__DIR__.'/../../../../../autoload.php')) {
     // installed as a dependency in `vendor`
-    require __DIR__ . '/../../../../../autoload.php';
+    require __DIR__.'/../../../../../autoload.php';
 } else {
     throw new \Exception('Can\'t find autoload.php. Did you install dependencies via composer?');
 }
 
-if ( ! file_exists(__DIR__ . '/Proxies') && ! mkdir(__DIR__ . '/Proxies')) {
-    throw new \Exception("Could not create " . __DIR__."/Proxies Folder.");
+if ( ! file_exists(__DIR__.'/Proxies') && ! mkdir(__DIR__.'/Proxies')) {
+    throw new \Exception("Could not create ".__DIR__."/Proxies Folder.");
 }
 
-if ( ! file_exists(__DIR__ . '/ORM/Proxy/generated') &&  ! mkdir(__DIR__ . '/ORM/Proxy/generated')) {
-    throw new \Exception('Could not create ' . __DIR__ . '/ORM/Proxy/generated Folder.');
+if ( ! file_exists(__DIR__.'/ORM/Proxy/generated') && ! mkdir(__DIR__.'/ORM/Proxy/generated')) {
+    throw new \Exception('Could not create '.__DIR__.'/ORM/Proxy/generated Folder.');
 }
 

tests/Doctrine/Tests/DbalTestCase.php

Spacing +1 added lines, -1 removed lines

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

tests/Doctrine/Tests/OrmFunctionalTestCase.php

Braces +5 added lines, -1 removed lines

@@ -786,7 +786,11 @@
             foreach ($last25queries as $i => $query) {
                 $params = array_map(
                     function($p) {
-                        if (is_object($p)) return get_class($p); else return var_export($p, true);
+                        if (is_object($p)) {
+                            return get_class($p);
+                        } else {
+                            return var_export($p, true);
+                        }
                     },
                     $query['params'] ?: []
                 );

Spacing +19 added lines, -19 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests;
 
@@ -403,7 +403,7 @@ 
             $conn->executeUpdate('DELETE FROM RoutingLocation');
         }
 
-        if(isset($this->usedModelSets['navigation'])) {
+        if (isset($this->usedModelSets['navigation'])) {
             $conn->executeUpdate('DELETE FROM navigation_tour_pois');
             $conn->executeUpdate('DELETE FROM navigation_photos');
             $conn->executeUpdate('DELETE FROM navigation_pois');
@@ -412,7 +412,7 @@ 
         }
 
         if (isset($this->usedModelSets['directorytree'])) {
-            $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier("file"));
+            $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier("file"));
             // MySQL doesn't know deferred deletions therefore only executing the second query gives errors.
             $conn->executeUpdate('DELETE FROM Directory WHERE parentDirectory_id IS NOT NULL');
             $conn->executeUpdate('DELETE FROM Directory');
@@ -505,12 +505,12 @@ 
                 )
             );
 
-            $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-users-groups'));
-            $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier("quote-group"));
-            $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier("quote-phone"));
-            $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier("quote-user"));
-            $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier("quote-address"));
-            $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-city'));
+            $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('quote-users-groups'));
+            $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier("quote-group"));
+            $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier("quote-phone"));
+            $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier("quote-user"));
+            $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier("quote-address"));
+            $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('quote-city'));
         }
 
         if (isset($this->usedModelSets['vct_onetoone'])) {
@@ -645,15 +645,15 @@ 
     {
         $this->setUpDBALTypes();
 
-        if (! isset(static::$sharedConn)) {
+        if ( ! isset(static::$sharedConn)) {
             static::$sharedConn = TestUtil::getConnection();
         }
 
         if (isset($GLOBALS['DOCTRINE_MARK_SQL_LOGS'])) {
             if (in_array(static::$sharedConn->getDatabasePlatform()->getName(), ["mysql", "postgresql"])) {
-                static::$sharedConn->executeQuery('SELECT 1 /*' . get_class($this) . '*/');
+                static::$sharedConn->executeQuery('SELECT 1 /*'.get_class($this).'*/');
             } else if (static::$sharedConn->getDatabasePlatform()->getName() === "oracle") {
-                static::$sharedConn->executeQuery('SELECT 1 /*' . get_class($this) . '*/ FROM dual');
+                static::$sharedConn->executeQuery('SELECT 1 /*'.get_class($this).'*/ FROM dual');
             }
         }
 
@@ -663,7 +663,7 @@ 
         }
 
         foreach ($this->usedModelSets as $setName => $bool) {
-            if (! isset(static::$tablesCreated[$setName])) {
+            if ( ! isset(static::$tablesCreated[$setName])) {
                 $this->setUpEntitySchema(static::$modelSets[$setName]);
 
                 static::$tablesCreated[$setName] = true;
@@ -738,8 +738,8 @@ 
 
         $config->setMetadataDriverImpl(
             $mappingDriver ?? $config->newDefaultAnnotationDriver([
-                realpath(__DIR__ . '/Models/Cache'),
-                realpath(__DIR__ . '/Models/GeoNames')
+                realpath(__DIR__.'/Models/Cache'),
+                realpath(__DIR__.'/Models/GeoNames')
             ])
         );
 
@@ -803,9 +803,9 @@ 
             $trace = $e->getTrace();
             $traceMsg = "";
 
-            foreach($trace AS $part) {
-                if(isset($part['file'])) {
-                    if(strpos($part['file'], "PHPUnit/") !== false) {
+            foreach ($trace AS $part) {
+                if (isset($part['file'])) {
+                    if (strpos($part['file'], "PHPUnit/") !== false) {
                         // Beginning with PHPUnit files we don't print the trace anymore.
                         break;
                     }
@@ -816,7 +816,7 @@ 
 
             $message = "[".get_class($e)."] ".$e->getMessage().PHP_EOL.PHP_EOL."With queries:".PHP_EOL.$queries.PHP_EOL."Trace:".PHP_EOL.$traceMsg;
 
-            throw new \Exception($message, (int)$e->getCode(), $e);
+            throw new \Exception($message, (int) $e->getCode(), $e);
         }
 
         throw $e;