doctrine / orm

tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php

Doc Comments +7 added lines, -1 removed lines

@@ -225,6 +225,9 @@ 
         self::assertEquals([], $metadata);
     }
 
+    /**
+     * @param \PHPUnit_Framework_MockObject_MockObject $conn
+     */
     protected function createEntityManager($metadataDriver, $conn = null)
     {
         $driverMock = new DriverMock();
@@ -257,7 +260,6 @@ 
     }
 
     /**
-     * @param string $class
      * @return ClassMetadata
      */
     protected function createValidClassMetadata()
@@ -498,6 +500,10 @@ 
         return $this->mockMetadata[$className];
     }
 
+    /**
+     * @param string $className
+     * @param ClassMetadata $metadata
+     */
     public function setMetadataForClass($className, $metadata)
     {
         $this->mockMetadata[$className] = $metadata;

Indentation +14 added lines, -14 removed lines

@@ -129,13 +129,13 @@ 
         $cmf = new ClassMetadataFactory();
         $driver = $this->createMock(MappingDriver::class);
         $driver->expects($this->at(0))
-               ->method('isTransient')
-               ->with($this->equalTo(CmsUser::class))
-               ->will($this->returnValue(true));
+                ->method('isTransient')
+                ->with($this->equalTo(CmsUser::class))
+                ->will($this->returnValue(true));
         $driver->expects($this->at(1))
-               ->method('isTransient')
-               ->with($this->equalTo(CmsArticle::class))
-               ->will($this->returnValue(false));
+                ->method('isTransient')
+                ->with($this->equalTo(CmsArticle::class))
+                ->will($this->returnValue(false));
 
         $em = $this->createEntityManager($driver);
 
@@ -151,13 +151,13 @@ 
         $cmf = new ClassMetadataFactory();
         $driver = $this->createMock(MappingDriver::class);
         $driver->expects($this->at(0))
-               ->method('isTransient')
-               ->with($this->equalTo(CmsUser::class))
-               ->will($this->returnValue(true));
+                ->method('isTransient')
+                ->with($this->equalTo(CmsUser::class))
+                ->will($this->returnValue(true));
         $driver->expects($this->at(1))
-               ->method('isTransient')
-               ->with($this->equalTo(CmsArticle::class))
-               ->will($this->returnValue(false));
+                ->method('isTransient')
+                ->with($this->equalTo(CmsArticle::class))
+                ->will($this->returnValue(false));
 
         $em = $this->createEntityManager($driver);
         $em->getConfiguration()->addEntityNamespace('CMS', 'Doctrine\Tests\Models\CMS');
@@ -316,8 +316,8 @@ 
     }
 
     /**
-    * @group DDC-1845
-    */
+     * @group DDC-1845
+     */
     public function testQuoteMetadata()
     {
         $cmf    = new ClassMetadataFactory();

Spacing +11 added lines, -11 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Mapping;
 
@@ -106,15 +106,15 @@ 
     {
         require_once __DIR__."/../../Models/Global/GlobalNamespaceModel.php";
 
-        $metadataDriver = $this->createAnnotationDriver([__DIR__ . '/../../Models/Global/']);
+        $metadataDriver = $this->createAnnotationDriver([__DIR__.'/../../Models/Global/']);
 
         $entityManager = $this->createEntityManager($metadataDriver);
 
         $mf = $entityManager->getMetadataFactory();
         $m1 = $mf->getMetadataFor(DoctrineGlobal_Article::class);
         $h1 = $mf->hasMetadataFor(DoctrineGlobal_Article::class);
-        $h2 = $mf->hasMetadataFor('\\' . DoctrineGlobal_Article::class);
-        $m2 = $mf->getMetadataFor('\\' . DoctrineGlobal_Article::class);
+        $h2 = $mf->hasMetadataFor('\\'.DoctrineGlobal_Article::class);
+        $m2 = $mf->getMetadataFor('\\'.DoctrineGlobal_Article::class);
 
         self::assertNotSame($m1, $m2);
         self::assertFalse($h2);
@@ -169,7 +169,7 @@ 
     public function testAddDefaultDiscriminatorMap()
     {
         $cmf = new ClassMetadataFactory();
-        $driver = $this->createAnnotationDriver([__DIR__ . '/../../Models/JoinedInheritanceType/']);
+        $driver = $this->createAnnotationDriver([__DIR__.'/../../Models/JoinedInheritanceType/']);
         $em = $this->createEntityManager($driver);
         $cmf->setEntityManager($em);
 
@@ -209,7 +209,7 @@ 
     {
         // DDC-3551
         $conn = $this->createMock(Connection::class);
-        $mockDriver    = new MetadataDriverMock();
+        $mockDriver = new MetadataDriverMock();
         $em = $this->createEntityManager($mockDriver, $conn);
 
         $conn->expects($this->any())
@@ -230,12 +230,12 @@ 
         $driverMock = new DriverMock();
         $config = new Configuration();
 
-        $config->setProxyDir(__DIR__ . '/../../Proxies');
+        $config->setProxyDir(__DIR__.'/../../Proxies');
         $config->setProxyNamespace('Doctrine\Tests\Proxies');
 
         $eventManager = new EventManager();
 
-        if (!$conn) {
+        if ( ! $conn) {
             $conn = new ConnectionMock([], $driverMock, $config, $eventManager);
         }
 
@@ -321,7 +321,7 @@ 
     public function testQuoteMetadata()
     {
         $cmf    = new ClassMetadataFactory();
-        $driver = $this->createAnnotationDriver([__DIR__ . '/../../Models/Quote/']);
+        $driver = $this->createAnnotationDriver([__DIR__.'/../../Models/Quote/']);
         $em     = $this->createEntityManager($driver);
         $cmf->setEntityManager($em);
 
@@ -410,7 +410,7 @@ 
         $listener
             ->expects($this->any())
             ->method('onClassMetadataNotFound')
-            ->will($this->returnCallback(function (OnClassMetadataNotFoundEventArgs $args) use ($metadata, $em, $test) {
+            ->will($this->returnCallback(function(OnClassMetadataNotFoundEventArgs $args) use ($metadata, $em, $test) {
                 $test->assertNull($args->getFoundMetadata());
                 $test->assertSame('Foo', $args->getClassName());
                 $test->assertSame($em, $args->getObjectManager());
@@ -472,7 +472,7 @@ 
     public function testInheritsIdGeneratorMappingFromEmbeddable()
     {
         $cmf = new ClassMetadataFactory();
-        $driver = $this->createAnnotationDriver([__DIR__ . '/../../Models/DDC4006/']);
+        $driver = $this->createAnnotationDriver([__DIR__.'/../../Models/DDC4006/']);
         $em = $this->createEntityManager($driver);
         $cmf->setEntityManager($em);
 

tests/Doctrine/Tests/ORM/Performance/SecondLevelCacheTest.php

Doc Comments +12 added lines

@@ -127,6 +127,9 @@ 
         self::assertEquals(503, $this->countQuery($em));
     }
 
+    /**
+     * @param string $label
+     */
     private function queryEntity(EntityManagerInterface $em, $label)
     {
         $times        = 100;
@@ -158,6 +161,9 @@ 
         printf("\n%s\n", str_repeat('-', 50));
     }
 
+    /**
+     * @param string $label
+     */
     public function findEntityOneToMany(EntityManagerInterface $em, $label)
     {
         $times        = 50;
@@ -217,6 +223,9 @@ 
         printf("\n%s\n", str_repeat('-', 50));
     }
 
+    /**
+     * @param string $label
+     */
     private function findEntity(EntityManagerInterface $em, $label)
     {
         $times        = 10;
@@ -252,6 +261,9 @@ 
         printf("\n%s\n", str_repeat('-', 50));
     }
 
+    /**
+     * @param string $label
+     */
     private function findAllEntity(EntityManagerInterface $em, $label)
     {
         $times        = 100;

Spacing +9 added lines, -9 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Performance;
 
@@ -133,7 +133,7 @@ 
         $size         = 500;
         $startPersist = microtime(true);
 
-        echo PHP_EOL . $label;
+        echo PHP_EOL.$label;
 
         for ($i = 0; $i < $size; $i++) {
             $em->persist(new Country("Country $i"));
@@ -167,7 +167,7 @@ 
         $startPersist = microtime(true);
         $country      = new Country("Country");
 
-        echo PHP_EOL . $label;
+        echo PHP_EOL.$label;
 
         $em->persist($country);
         $em->flush();
@@ -197,9 +197,9 @@ 
         $em->flush();
         $em->clear();
 
-        printf("\n[%s] persist %s states and %s cities", number_format( microtime(true) - $startPersist, 6), count($states), count($cities));
+        printf("\n[%s] persist %s states and %s cities", number_format(microtime(true) - $startPersist, 6), count($states), count($cities));
 
-        $startFind  = microtime(true);
+        $startFind = microtime(true);
 
         for ($i = 0; $i < $times; $i++) {
 
@@ -224,7 +224,7 @@ 
         $countries    = [];
         $startPersist = microtime(true);
 
-        echo PHP_EOL . $label;
+        echo PHP_EOL.$label;
 
         for ($i = 0; $i < $size; $i++) {
             $country = new Country("Country $i");
@@ -239,7 +239,7 @@ 
 
         printf("\n[%s] persist %s countries", number_format(microtime(true) - $startPersist, 6), $size);
 
-        $startFind  = microtime(true);
+        $startFind = microtime(true);
 
         for ($i = 0; $i <= $times; $i++) {
             foreach ($countries as $country) {
@@ -259,7 +259,7 @@ 
         $startPersist = microtime(true);
         $rep          = $em->getRepository(Country::class);
 
-        echo PHP_EOL . $label;
+        echo PHP_EOL.$label;
 
         for ($i = 0; $i < $size; $i++) {
             $em->persist(new Country("Country $i"));
@@ -270,7 +270,7 @@ 
 
         printf("\n[%s] persist %s countries", number_format(microtime(true) - $startPersist, 6), $size);
 
-        $startFind  = microtime(true);
+        $startFind = microtime(true);
 
         for ($i = 0; $i <= $times; $i++) {
             $list = $rep->findAll();

tests/Doctrine/Tests/ORM/Persisters/BasicEntityPersisterTypeValueSqlTest.php

Unused Use Statements -1 removed lines

@@ -10,7 +10,6 @@
 use Doctrine\ORM\Mapping\OneToOneAssociationMetadata;
 use Doctrine\ORM\Persisters\Entity\BasicEntityPersister;
 use Doctrine\Tests\Models\CustomType\CustomTypeChild;
-use Doctrine\Tests\Models\CustomType\CustomTypeFriend;
 use Doctrine\Tests\Models\CustomType\CustomTypeParent;
 use Doctrine\Tests\Models\Generic\NonAlphaColumnsEntity;
 use Doctrine\Tests\OrmTestCase;

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Persisters;
 
@@ -93,7 +93,7 @@ 
         $method = new \ReflectionMethod($this->persister, 'getSelectConditionSQL');
         $method->setAccessible(true);
 
-        $sql = $method->invoke($this->persister,  ['customInteger' => 1, 'child' => 1]);
+        $sql = $method->invoke($this->persister, ['customInteger' => 1, 'child' => 1]);
 
         self::assertEquals('t0."customInteger" = ABS(?) AND t0."child_id" = ?', $sql);
     }

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/Query/DeleteSqlGenerationTest.php

Doc Comments +4 added lines

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

Spacing +1 added lines, -1 removed lines

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

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

Doc Comments +4 added lines

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

Spacing +1 added lines, -1 removed lines

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

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::assertEquals(1, count($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');

Spacing +40 added lines, -40 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Tools;
 
@@ -31,7 +31,7 @@ 
         $this->namespace = uniqid("doctrine_");
         $this->tmpDir = sys_get_temp_dir();
 
-        mkdir($this->tmpDir . \DIRECTORY_SEPARATOR . $this->namespace);
+        mkdir($this->tmpDir.\DIRECTORY_SEPARATOR.$this->namespace);
 
         $this->generator = new EntityGenerator();
 
@@ -44,7 +44,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 */
@@ -53,7 +53,7 @@ 
             }
         }
 
-        rmdir($this->tmpDir . '/' . $this->namespace);
+        rmdir($this->tmpDir.'/'.$this->namespace);
     }
 
     /**
@@ -63,9 +63,9 @@ 
      */
     public function generateBookEntityFixture(array $embeddedClasses = [])
     {
-        $metadata = new ClassMetadata($this->namespace . '\EntityGeneratorBook');
+        $metadata = new ClassMetadata($this->namespace.'\EntityGeneratorBook');
 
-        $metadata->setCustomRepositoryClassName($this->namespace . '\EntityGeneratorBookRepository');
+        $metadata->setCustomRepositoryClassName($this->namespace.'\EntityGeneratorBookRepository');
 
         $tableMetadata = new Mapping\TableMetadata();
 
@@ -184,7 +184,7 @@ 
 
     private function generateEntityTypeFixture(array $field)
     {
-        $metadata = new ClassMetadata($this->namespace . '\EntityType');
+        $metadata = new ClassMetadata($this->namespace.'\EntityType');
 
         $tableMetadata = new Mapping\TableMetadata();
         $tableMetadata->setName('entity_type');
@@ -217,7 +217,7 @@ 
      */
     private function generateIsbnEmbeddableFixture(array $embeddedClasses = [], $columnPrefix = null)
     {
-        $metadata = new ClassMetadata($this->namespace . '\EntityGeneratorIsbn');
+        $metadata = new ClassMetadata($this->namespace.'\EntityGeneratorIsbn');
         $metadata->isEmbeddedClass = true;
 
         $fieldMetadata = new Mapping\FieldMetadata('prefix');
@@ -275,7 +275,7 @@ 
      */
     private function generateTestEmbeddableFixture()
     {
-        $metadata = new ClassMetadata($this->namespace . '\EntityGeneratorTestEmbeddable');
+        $metadata = new ClassMetadata($this->namespace.'\EntityGeneratorTestEmbeddable');
 
         $metadata->isEmbeddedClass = true;
 
@@ -318,7 +318,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);
 
@@ -469,7 +469,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());
@@ -621,7 +621,7 @@ 
      */
     public function testMappedSuperclassAnnotationGeneration()
     {
-        $metadata = new ClassMetadata($this->namespace . '\EntityGeneratorBook');
+        $metadata = new ClassMetadata($this->namespace.'\EntityGeneratorBook');
 
         $metadata->isMappedSuperclass = true;
 
@@ -659,7 +659,7 @@ 
      */
     public function testGenerateEntityWithSequenceGenerator()
     {
-        $metadata = new ClassMetadata($this->namespace . '\DDC1784Entity');
+        $metadata = new ClassMetadata($this->namespace.'\DDC1784Entity');
 
         $fieldMetadata = new Mapping\FieldMetadata('id');
         $fieldMetadata->setType(Type::getType('integer'));
@@ -676,8 +676,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);
 
@@ -697,7 +697,7 @@ 
      */
     public function testGenerateEntityWithMultipleInverseJoinColumns()
     {
-        $metadata = new ClassMetadata($this->namespace . '\DDC2079Entity');
+        $metadata = new ClassMetadata($this->namespace.'\DDC2079Entity');
 
         $fieldMetadata = new Mapping\FieldMetadata('id');
         $fieldMetadata->setType(Type::getType('integer'));
@@ -736,14 +736,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);
 
@@ -774,7 +774,7 @@ 
         $method->setAccessible(true);
 
         foreach ($constants as $name => $value) {
-            if( ! preg_match($pattern, $name)) {
+            if ( ! preg_match($pattern, $name)) {
                 continue;
             }
 
@@ -803,7 +803,7 @@ 
         $method->setAccessible(true);
 
         foreach ($constants as $name => $value) {
-            if( ! preg_match($pattern, $name)) {
+            if ( ! preg_match($pattern, $name)) {
                 continue;
             }
 
@@ -832,7 +832,7 @@ 
         $method->setAccessible(true);
 
         foreach ($constants as $name => $value) {
-            if( ! preg_match($pattern, $name)) {
+            if ( ! preg_match($pattern, $name)) {
                 continue;
             }
 
@@ -856,7 +856,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;
@@ -869,8 +869,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));
@@ -893,13 +893,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());
 
@@ -921,12 +921,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());
 
@@ -946,22 +946,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 { ... }
@@ -969,13 +969,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;
 
@@ -1138,7 +1138,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);
@@ -1147,7 +1147,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)) {

Indentation +1 added lines, -1 removed lines

@@ -381,7 +381,7 @@
 
         self::assertEquals('user', $property->getInversedBy());
     }
-	/**
+    /**
      * @depends testExportDirectoryAndFilesAreCreated
      */
     public function testCascadeAllCollapsed()

Spacing +12 added lines, -12 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Tools\Export;
 
@@ -44,7 +44,7 @@ 
         $driverMock = new DriverMock();
         $config     = new Configuration();
 
-        $config->setProxyDir(__DIR__ . '/../../Proxies');
+        $config->setProxyDir(__DIR__.'/../../Proxies');
         $config->setProxyNamespace('Doctrine\Tests\Proxies');
         $eventManager = new EventManager();
         $conn = new ConnectionMock([], $driverMock, $config, $eventManager);
@@ -65,7 +65,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')
@@ -88,10 +88,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();
@@ -103,7 +103,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());
@@ -115,9 +115,9 @@ 
         $exporter->export();
 
         if ($type == 'annotation') {
-            self::assertTrue(file_exists(__DIR__ . '/export/' . $type . '/'.str_replace('\\', '/', ExportedUser::class).$this->extension));
+            self::assertTrue(file_exists(__DIR__.'/export/'.$type.'/'.str_replace('\\', '/', ExportedUser::class).$this->extension));
         } else {
-            self::assertTrue(file_exists(__DIR__ . '/export/' . $type . '/Doctrine.Tests.ORM.Tools.Export.ExportedUser'.$this->extension));
+            self::assertTrue(file_exists(__DIR__.'/export/'.$type.'/Doctrine.Tests.ORM.Tools.Export.ExportedUser'.$this->extension));
         }
     }
 
@@ -128,7 +128,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();
@@ -389,7 +389,7 @@ 
         $type = $this->getType();
 
         if ($type == 'xml') {
-            $xml = simplexml_load_file(__DIR__ . '/export/'.$type.'/Doctrine.Tests.ORM.Tools.Export.ExportedUser.dcm.xml');
+            $xml = simplexml_load_file(__DIR__.'/export/'.$type.'/Doctrine.Tests.ORM.Tools.Export.ExportedUser.dcm.xml');
 
             $xml->registerXPathNamespace("d", "http://doctrine-project.org/schemas/orm/doctrine-mapping");
             $nodes = $xml->xpath("/d:doctrine-mapping/d:entity/d:one-to-many[@field='interests']/d:cascade/d:*");
@@ -411,10 +411,10 @@ 
         if (is_file($path)) {
             return unlink($path);
         } else 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);
                 }
             }