doctrine / orm

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

Unused Use Statements +3 added lines, -4 removed lines

@@ -3,14 +3,13 @@
 namespace Doctrine\Tests\ORM\Functional;
 
 use Doctrine\Common\Collections\ArrayCollection;
-
 use Doctrine\ORM\NonUniqueResultException;
 use Doctrine\ORM\Proxy\Proxy;
 use Doctrine\ORM\Query\QueryException;
 use Doctrine\ORM\UnexpectedResultException;
-use Doctrine\Tests\Models\CMS\CmsUser,
-    Doctrine\Tests\Models\CMS\CmsArticle,
-    Doctrine\Tests\Models\CMS\CmsPhonenumber;
+use Doctrine\Tests\Models\CMS\CmsUser;
+use Doctrine\Tests\Models\CMS\CmsArticle;
+use Doctrine\Tests\Models\CMS\CmsPhonenumber;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\Query\Parameter;

Indentation +24 added lines, -24 removed lines

@@ -148,7 +148,7 @@ 
         $this->expectExceptionMessage('Too few parameters: the query defines 1 parameters but you only bound 0');
 
         $this->_em->createQuery('SELECT u FROM ' . CmsUser::class . ' u WHERE u.name = ?1')
-                  ->getSingleResult();
+                    ->getSingleResult();
     }
 
     public function testInvalidInputParameterThrowsException()
@@ -156,8 +156,8 @@ 
         $this->expectException(QueryException::class);
 
         $this->_em->createQuery('SELECT u FROM ' . CmsUser::class . ' u WHERE u.name = ?')
-                  ->setParameter(1, 'jwage')
-                  ->getSingleResult();
+                    ->setParameter(1, 'jwage')
+                    ->getSingleResult();
     }
 
     public function testSetParameters()
@@ -167,8 +167,8 @@ 
         $parameters->add(new Parameter(2, 'active'));
 
         $this->_em->createQuery('SELECT u FROM ' . CmsUser::class . ' u WHERE u.name = ?1 AND u.status = ?2')
-                  ->setParameters($parameters)
-                  ->getResult();
+                    ->setParameters($parameters)
+                    ->getResult();
 
         $extractValue = function (Parameter $parameter) {
             return $parameter->getValue();
@@ -185,8 +185,8 @@ 
         $parameters = [1 => 'jwage', 2 => 'active'];
 
         $this->_em->createQuery('SELECT u FROM ' . CmsUser::class . ' u WHERE u.name = ?1 AND u.status = ?2')
-                  ->setParameters($parameters)
-                  ->getResult();
+                    ->setParameters($parameters)
+                    ->getResult();
 
         self::assertSame(
             array_values($parameters),
@@ -330,7 +330,7 @@ 
     public function testGetSingleResultThrowsExceptionOnNoResult()
     {
         $this->_em->createQuery("select a from Doctrine\Tests\Models\CMS\CmsArticle a")
-             ->getSingleResult();
+                ->getSingleResult();
     }
 
     /**
@@ -339,7 +339,7 @@ 
     public function testGetSingleScalarResultThrowsExceptionOnNoResult()
     {
         $this->_em->createQuery("select a from Doctrine\Tests\Models\CMS\CmsArticle a")
-             ->getSingleScalarResult();
+                ->getSingleScalarResult();
     }
 
     /**
@@ -370,7 +370,7 @@ 
         $this->_em->clear();
 
         $this->_em->createQuery("select a from Doctrine\Tests\Models\CMS\CmsArticle a")
-             ->getSingleScalarResult();
+                ->getSingleScalarResult();
     }
 
     public function testModifiedLimitQuery()
@@ -387,27 +387,27 @@ 
         $this->_em->clear();
 
         $data = $this->_em->createQuery('SELECT u FROM ' . CmsUser::class . ' u')
-                  ->setFirstResult(1)
-                  ->setMaxResults(2)
-                  ->getResult();
+                    ->setFirstResult(1)
+                    ->setMaxResults(2)
+                    ->getResult();
 
         $this->assertEquals(2, count($data));
         $this->assertEquals('gblanco1', $data[0]->username);
         $this->assertEquals('gblanco2', $data[1]->username);
 
         $data = $this->_em->createQuery('SELECT u FROM ' . CmsUser::class . ' u')
-                  ->setFirstResult(3)
-                  ->setMaxResults(2)
-                  ->getResult();
+                    ->setFirstResult(3)
+                    ->setMaxResults(2)
+                    ->getResult();
 
         $this->assertEquals(2, count($data));
         $this->assertEquals('gblanco3', $data[0]->username);
         $this->assertEquals('gblanco4', $data[1]->username);
 
         $data = $this->_em->createQuery('SELECT u FROM ' . CmsUser::class . ' u')
-                  ->setFirstResult(3)
-                  ->setMaxResults(2)
-                  ->getScalarResult();
+                    ->setFirstResult(3)
+                    ->setMaxResults(2)
+                    ->getScalarResult();
     }
 
     public function testSupportsQueriesWithEntityNamespaces()
@@ -476,8 +476,8 @@ 
         $this->_em->clear();
 
         $articles = $this->_em->createQuery('select a from Doctrine\Tests\Models\CMS\CmsArticle a')
-                         ->setFetchMode(CmsArticle::class, 'user', ClassMetadata::FETCH_EAGER)
-                         ->getResult();
+                            ->setFetchMode(CmsArticle::class, 'user', ClassMetadata::FETCH_EAGER)
+                            ->getResult();
 
         $this->assertEquals(10, count($articles));
         foreach ($articles AS $article) {
@@ -619,9 +619,9 @@ 
     {
         $qb = $this->_em->createQueryBuilder();
         $qb->select('u')
-           ->from(CmsUser::class, 'u')
-           ->innerJoin('u.articles', 'a')
-           ->where('(u.id = 0) OR (u.id IS NULL)');
+            ->from(CmsUser::class, 'u')
+            ->innerJoin('u.articles', 'a')
+            ->where('(u.id = 0) OR (u.id IS NULL)');
 
         $query = $qb->getQuery();
         $users = $query->execute();

Spacing +21 added lines, -21 removed lines

@@ -94,7 +94,7 @@ 
         $this->_em->flush();
         $this->_em->clear();
 
-        $query = $this->_em->createQuery('select u, a from ' . CmsUser::class . ' u join u.articles a ORDER BY a.topic');
+        $query = $this->_em->createQuery('select u, a from '.CmsUser::class.' u join u.articles a ORDER BY a.topic');
         $users = $query->getResult();
         $this->assertEquals(1, count($users));
         $this->assertInstanceOf(CmsUser::class, $users[0]);
@@ -113,7 +113,7 @@ 
         $this->_em->flush();
         $this->_em->clear();
 
-        $q = $this->_em->createQuery('SELECT u FROM ' . CmsUser::class . ' u WHERE u.username = ?0');
+        $q = $this->_em->createQuery('SELECT u FROM '.CmsUser::class.' u WHERE u.username = ?0');
         $q->setParameter(0, 'jwage');
         $user = $q->getSingleResult();
 
@@ -125,7 +125,7 @@ 
         $this->expectException(QueryException::class);
         $this->expectExceptionMessage('Invalid parameter: token 2 is not defined in the query.');
 
-        $q = $this->_em->createQuery('SELECT u FROM ' . CmsUser::class . ' u WHERE u.name = ?1');
+        $q = $this->_em->createQuery('SELECT u FROM '.CmsUser::class.' u WHERE u.name = ?1');
         $q->setParameter(2, 'jwage');
         $user = $q->getSingleResult();
     }
@@ -135,7 +135,7 @@ 
         $this->expectException(QueryException::class);
         $this->expectExceptionMessage('Too many parameters: the query defines 1 parameters and you bound 2');
 
-        $q = $this->_em->createQuery('SELECT u FROM ' . CmsUser::class . ' u WHERE u.name = ?1');
+        $q = $this->_em->createQuery('SELECT u FROM '.CmsUser::class.' u WHERE u.name = ?1');
         $q->setParameter(1, 'jwage');
         $q->setParameter(2, 'jwage');
 
@@ -147,7 +147,7 @@ 
         $this->expectException(QueryException::class);
         $this->expectExceptionMessage('Too few parameters: the query defines 1 parameters but you only bound 0');
 
-        $this->_em->createQuery('SELECT u FROM ' . CmsUser::class . ' u WHERE u.name = ?1')
+        $this->_em->createQuery('SELECT u FROM '.CmsUser::class.' u WHERE u.name = ?1')
                   ->getSingleResult();
     }
 
@@ -155,7 +155,7 @@ 
     {
         $this->expectException(QueryException::class);
 
-        $this->_em->createQuery('SELECT u FROM ' . CmsUser::class . ' u WHERE u.name = ?')
+        $this->_em->createQuery('SELECT u FROM '.CmsUser::class.' u WHERE u.name = ?')
                   ->setParameter(1, 'jwage')
                   ->getSingleResult();
     }
@@ -166,11 +166,11 @@ 
         $parameters->add(new Parameter(1, 'jwage'));
         $parameters->add(new Parameter(2, 'active'));
 
-        $this->_em->createQuery('SELECT u FROM ' . CmsUser::class . ' u WHERE u.name = ?1 AND u.status = ?2')
+        $this->_em->createQuery('SELECT u FROM '.CmsUser::class.' u WHERE u.name = ?1 AND u.status = ?2')
                   ->setParameters($parameters)
                   ->getResult();
 
-        $extractValue = function (Parameter $parameter) {
+        $extractValue = function(Parameter $parameter) {
             return $parameter->getValue();
         };
 
@@ -184,7 +184,7 @@ 
     {
         $parameters = [1 => 'jwage', 2 => 'active'];
 
-        $this->_em->createQuery('SELECT u FROM ' . CmsUser::class . ' u WHERE u.name = ?1 AND u.status = ?2')
+        $this->_em->createQuery('SELECT u FROM '.CmsUser::class.' u WHERE u.name = ?1 AND u.status = ?2')
                   ->setParameters($parameters)
                   ->getResult();
 
@@ -214,7 +214,7 @@ 
         $this->_em->clear();
         $articleId = $article1->id;
 
-        $query = $this->_em->createQuery('select a from ' . CmsArticle::class . ' a WHERE a.topic = ?1');
+        $query = $this->_em->createQuery('select a from '.CmsArticle::class.' a WHERE a.topic = ?1');
         $articles = $query->iterate(new ArrayCollection([new Parameter(1, 'Doctrine 2')]), Query::HYDRATE_ARRAY);
 
         $found = [];
@@ -255,19 +255,19 @@ 
         $this->_em->flush();
         $this->_em->clear();
 
-        $query = $this->_em->createQuery('select a from ' . CmsArticle::class . ' a');
+        $query = $this->_em->createQuery('select a from '.CmsArticle::class.' a');
         $articles = $query->iterate();
 
         $iteratedCount = 0;
         $topics = [];
 
-        foreach($articles AS $row) {
+        foreach ($articles AS $row) {
             $article = $row[0];
             $topics[] = $article->topic;
 
             $identityMap = $this->_em->getUnitOfWork()->getIdentityMap();
             $identityMapCount = count($identityMap[CmsArticle::class]);
-            $this->assertTrue($identityMapCount>$iteratedCount);
+            $this->assertTrue($identityMapCount > $iteratedCount);
 
             $iteratedCount++;
         }
@@ -300,7 +300,7 @@ 
 
         $iteratedCount = 0;
         $topics = [];
-        foreach($articles AS $row) {
+        foreach ($articles AS $row) {
             $article  = $row[0];
             $topics[] = $article->topic;
 
@@ -377,8 +377,8 @@ 
     {
         for ($i = 0; $i < 5; $i++) {
             $user = new CmsUser;
-            $user->name = 'Guilherme' . $i;
-            $user->username = 'gblanco' . $i;
+            $user->name = 'Guilherme'.$i;
+            $user->username = 'gblanco'.$i;
             $user->status = 'developer';
             $this->_em->persist($user);
         }
@@ -386,7 +386,7 @@ 
         $this->_em->flush();
         $this->_em->clear();
 
-        $data = $this->_em->createQuery('SELECT u FROM ' . CmsUser::class . ' u')
+        $data = $this->_em->createQuery('SELECT u FROM '.CmsUser::class.' u')
                   ->setFirstResult(1)
                   ->setMaxResults(2)
                   ->getResult();
@@ -395,7 +395,7 @@ 
         $this->assertEquals('gblanco1', $data[0]->username);
         $this->assertEquals('gblanco2', $data[1]->username);
 
-        $data = $this->_em->createQuery('SELECT u FROM ' . CmsUser::class . ' u')
+        $data = $this->_em->createQuery('SELECT u FROM '.CmsUser::class.' u')
                   ->setFirstResult(3)
                   ->setMaxResults(2)
                   ->getResult();
@@ -404,7 +404,7 @@ 
         $this->assertEquals('gblanco3', $data[0]->username);
         $this->assertEquals('gblanco4', $data[1]->username);
 
-        $data = $this->_em->createQuery('SELECT u FROM ' . CmsUser::class . ' u')
+        $data = $this->_em->createQuery('SELECT u FROM '.CmsUser::class.' u')
                   ->setFirstResult(3)
                   ->setMaxResults(2)
                   ->getScalarResult();
@@ -498,13 +498,13 @@ 
         $this->_em->flush();
         $this->_em->clear();
 
-        $query = $this->_em->createQuery("select u from " . CmsUser::class . " u where u.username = 'gblanco'");
+        $query = $this->_em->createQuery("select u from ".CmsUser::class." u where u.username = 'gblanco'");
 
         $fetchedUser = $query->getOneOrNullResult();
         $this->assertInstanceOf(CmsUser::class, $fetchedUser);
         $this->assertEquals('gblanco', $fetchedUser->username);
 
-        $query = $this->_em->createQuery("select u.username from " . CmsUser::class . " u where u.username = 'gblanco'");
+        $query = $this->_em->createQuery("select u.username from ".CmsUser::class." u where u.username = 'gblanco'");
         $fetchedUsername = $query->getOneOrNullResult(Query::HYDRATE_SINGLE_SCALAR);
         $this->assertEquals('gblanco', $fetchedUsername);
     }

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

Doc Comments +7 added lines

@@ -173,6 +173,10 @@ 
      */
     public $phones;
 
+    /**
+     * @param string $email
+     * @param string $name
+     */
     public function __construct($email, $name, array $numbers = [])
     {
         $this->name   = $name;
@@ -208,6 +212,9 @@ 
      */
     public $user;
 
+    /**
+     * @param DDC1335User $user
+     */
     public function __construct($user, $number)
     {
         $this->user     = $user;

Spacing +16 added lines, -16 removed lines

@@ -18,14 +18,14 @@ 
                 ]
             );
             $this->loadFixture();
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
         }
     }
 
 
     public function testDql()
     {
-        $dql      = 'SELECT u FROM ' . __NAMESPACE__ . '\DDC1335User u INDEX BY u.id';
+        $dql      = 'SELECT u FROM '.__NAMESPACE__.'\DDC1335User u INDEX BY u.id';
         $query    = $this->_em->createQuery($dql);
         $result   = $query->getResult();
 
@@ -34,7 +34,7 @@ 
         $this->assertArrayHasKey(2, $result);
         $this->assertArrayHasKey(3, $result);
 
-        $dql      = 'SELECT u, p FROM '.__NAMESPACE__ . '\DDC1335User u INDEX BY u.email INNER JOIN u.phones p INDEX BY p.id';
+        $dql      = 'SELECT u, p FROM '.__NAMESPACE__.'\DDC1335User u INDEX BY u.email INNER JOIN u.phones p INDEX BY p.id';
         $query    = $this->_em->createQuery($dql);
         $result   = $query->getResult();
 
@@ -76,7 +76,7 @@ 
         $this->assertArrayHasKey(1, $result);
         $this->assertArrayHasKey(2, $result);
         $this->assertArrayHasKey(3, $result);
-        $this->assertEquals('SELECT u FROM ' . __NAMESPACE__ . '\DDC1335User u INDEX BY u.id', $dql);
+        $this->assertEquals('SELECT u FROM '.__NAMESPACE__.'\DDC1335User u INDEX BY u.id', $dql);
     }
 
     public function testIndexByUnique()
@@ -91,13 +91,13 @@ 
         $this->assertArrayHasKey('foo@foo.com', $result);
         $this->assertArrayHasKey('bar@bar.com', $result);
         $this->assertArrayHasKey('foobar@foobar.com', $result);
-        $this->assertEquals('SELECT u FROM ' . __NAMESPACE__ . '\DDC1335User u INDEX BY u.email', $dql);
+        $this->assertEquals('SELECT u FROM '.__NAMESPACE__.'\DDC1335User u INDEX BY u.email', $dql);
     }
 
     public function  testIndexWithJoin()
     {
         $builder = $this->_em->createQueryBuilder();
-        $builder->select('u','p')
+        $builder->select('u', 'p')
                 ->from(DDC1335User::class, 'u', 'u.email')
                 ->join('u.phones', 'p', null, null, 'p.id');
 
@@ -125,18 +125,18 @@ 
         $this->assertArrayHasKey(8, $result['foobar@foobar.com']->phones->toArray());
         $this->assertArrayHasKey(9, $result['foobar@foobar.com']->phones->toArray());
 
-        $this->assertEquals('SELECT u, p FROM '.__NAMESPACE__ . '\DDC1335User u INDEX BY u.email INNER JOIN u.phones p INDEX BY p.id', $dql);
+        $this->assertEquals('SELECT u, p FROM '.__NAMESPACE__.'\DDC1335User u INDEX BY u.email INNER JOIN u.phones p INDEX BY p.id', $dql);
     }
 
     private function loadFixture()
     {
-        $p1 = ['11 xxxx-xxxx','11 yyyy-yyyy','11 zzzz-zzzz'];
-        $p2 = ['22 xxxx-xxxx','22 yyyy-yyyy','22 zzzz-zzzz'];
-        $p3 = ['33 xxxx-xxxx','33 yyyy-yyyy','33 zzzz-zzzz'];
+        $p1 = ['11 xxxx-xxxx', '11 yyyy-yyyy', '11 zzzz-zzzz'];
+        $p2 = ['22 xxxx-xxxx', '22 yyyy-yyyy', '22 zzzz-zzzz'];
+        $p3 = ['33 xxxx-xxxx', '33 yyyy-yyyy', '33 zzzz-zzzz'];
 
-        $u1 = new DDC1335User("foo@foo.com", "Foo",$p1);
-        $u2 = new DDC1335User("bar@bar.com", "Bar",$p2);
-        $u3 = new DDC1335User("foobar@foobar.com", "Foo Bar",$p3);
+        $u1 = new DDC1335User("foo@foo.com", "Foo", $p1);
+        $u2 = new DDC1335User("bar@bar.com", "Bar", $p2);
+        $u3 = new DDC1335User("foobar@foobar.com", "Foo Bar", $p3);
 
         $this->_em->persist($u1);
         $this->_em->persist($u2);
@@ -180,7 +180,7 @@ 
         $this->phones = new \Doctrine\Common\Collections\ArrayCollection();
 
         foreach ($numbers as $number) {
-            $this->phones->add(new DDC1335Phone($this,$number));
+            $this->phones->add(new DDC1335Phone($this, $number));
         }
     }
 }
@@ -210,7 +210,7 @@ 
 
     public function __construct($user, $number)
     {
-        $this->user     = $user;
-        $this->numericalValue   = $number;
+        $this->user = $user;
+        $this->numericalValue = $number;
     }
 }

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

Doc Comments +8 added lines

@@ -119,6 +119,10 @@ 
      */
     public $driverRides;
 
+    /**
+     * @param integer $id
+     * @param string $name
+     */
     public function __construct($id, $name)
     {
         $this->driverRides = new ArrayCollection();
@@ -181,6 +185,10 @@ 
      */
     public $carRides;
 
+    /**
+     * @param string $brand
+     * @param string $model
+     */
     public function __construct($brand, $model)
     {
         $this->carRides = new ArrayCollection();

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

Doc Comments +7 added lines, -1 removed lines

@@ -227,6 +227,9 @@ 
         $this->assertEquals([], $metadata);
     }
 
+    /**
+     * @param \PHPUnit_Framework_MockObject_MockObject $conn
+     */
     protected function _createEntityManager($metadataDriver, $conn = null)
     {
         $driverMock = new DriverMock();
@@ -255,7 +258,6 @@ 
     }
 
     /**
-     * @param string $class
      * @return ClassMetadata
      */
     protected function _createValidClassMetadata()
@@ -469,6 +471,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

@@ -131,13 +131,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);
 
@@ -153,13 +153,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');
@@ -283,8 +283,8 @@ 
     }
 
     /**
-    * @group DDC-1845
-    */
+     * @group DDC-1845
+     */
     public function testQuoteMetadata()
     {
         $cmf    = new ClassMetadataFactory();

Spacing +10 added lines, -10 removed lines

@@ -108,15 +108,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);
 
         $this->assertNotSame($m1, $m2);
         $this->assertFalse($h2);
@@ -171,7 +171,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);
 
@@ -211,7 +211,7 @@ 
     {
         // DDC-3551
         $conn = $this->createMock(Connection::class);
-        $mockDriver    = new MetadataDriverMock();
+        $mockDriver = new MetadataDriverMock();
         $em = $this->_createEntityManager($mockDriver, $conn);
 
         $conn->expects($this->any())
@@ -231,10 +231,10 @@ 
     {
         $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);
         }
         $config->setMetadataDriverImpl($metadataDriver);
@@ -288,7 +288,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);
 
@@ -383,7 +383,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());
@@ -443,7 +443,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/Mapping/ReflectionEmbeddedPropertyTest.php

Unused Use Statements -1 removed lines

@@ -5,7 +5,6 @@
 use Doctrine\Instantiator\Instantiator;
 use Doctrine\ORM\Mapping\ReflectionEmbeddedProperty;
 use Doctrine\Tests\Models\Generic\BooleanModel;
-use Doctrine\Tests\Models\Mapping\Entity;
 use Doctrine\Tests\Models\Reflection\AbstractEmbeddable;
 use Doctrine\Tests\Models\Reflection\ArrayObjectExtendingClass;
 use Doctrine\Tests\Models\Reflection\ConcreteEmbeddable;

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

Unused Use Statements -1 removed lines

@@ -7,7 +7,6 @@
 use Doctrine\DBAL\Types\Type as DBALType;
 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 +1 added lines, -1 removed lines

@@ -84,7 +84,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]);
 
         $this->assertEquals('t0.customInteger = ABS(?) AND t0.child_id = ?', $sql);
     }

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

Doc Comments +4 added lines

@@ -38,6 +38,10 @@
         return $query->getSql();
     }
 
+    /**
+     * @param string $dqlToBeTested
+     * @param string $sqlToBeConfirmed
+     */
     public function assertSqlGeneration($dqlToBeTested, $sqlToBeConfirmed, $treeWalkers = [], $outputWalker = null)
     {
         try {

Spacing +4 added lines, -4 removed lines

@@ -43,7 +43,7 @@ 
         try {
             $this->assertEquals($sqlToBeConfirmed, $this->generateSql($dqlToBeTested, $treeWalkers, $outputWalker));
         } 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());
         }
     }
 
@@ -201,9 +201,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;
@@ -212,7 +212,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/UpdateSqlGenerationTest.php

Doc Comments +4 added lines

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

tests/Doctrine/Tests/ORM/QueryBuilderTest.php

Doc Comments +3 added lines

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

Indentation +37 added lines, -37 removed lines

@@ -272,12 +272,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');
 
         $this->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');
     }
@@ -286,9 +286,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]));
 
         $this->assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = :uid AND u.id IN(1, 2, 3)');
     }
@@ -297,9 +297,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]));
 
         $this->assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = :uid OR u.id IN(1, 2, 3)');
     }
@@ -308,9 +308,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]));
 
         $this->assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = :uid AND u.id NOT IN(1, 2, 3)');
     }
@@ -319,9 +319,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]));
 
         $this->assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = :uid OR u.id NOT IN(1, 2, 3)');
     }
@@ -617,8 +617,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'));
@@ -634,8 +634,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));
@@ -684,8 +684,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'));
 
         $this->assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = :uid OR u.id = :uid2');
     }
@@ -698,8 +698,8 @@ 
         $orExpr->add($qb->expr()->in('u.id', [1]));
 
         $qb->select('u')
-           ->from(CmsUser::class, 'u')
-           ->where($orExpr);
+            ->from(CmsUser::class, 'u')
+            ->where($orExpr);
 
         $this->assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = :uid3 OR u.id IN(1)');
     }
@@ -708,8 +708,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']));
 
         $this->assertValidQueryBuilder($qb, "SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.name IN('one', 'two', 'three')");
 
@@ -723,8 +723,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')]));
 
         $this->assertValidQueryBuilder($qb, "SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.name IN('one', 'two', 'three')");
 
@@ -742,8 +742,8 @@ 
 
         $qb = $this->_em->createQueryBuilder();
         $qb->select('u')
-           ->from(CmsUser::class, 'u')
-           ->where($orExpr);
+            ->from(CmsUser::class, 'u')
+            ->where($orExpr);
 
         $this->assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = :uid3 OR NOT(u.id IN(1))');
     }
@@ -754,8 +754,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')));
 
         $this->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)');
 
@@ -1121,9 +1121,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 +6 added lines, -6 removed lines

@@ -547,7 +547,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]);
@@ -824,7 +824,7 @@ 
             ->from(CmsUser::class, 'u')
             ->where('u.username = ?1')->orderBy('u.username');
 
-        $this->assertEquals('u.username = ?1', (string)$qb->getDQLPart('where'));
+        $this->assertEquals('u.username = ?1', (string) $qb->getDQLPart('where'));
         $this->assertEquals(1, count($qb->getDQLPart('orderBy')));
 
         $qb->resetDQLPart('where')->resetDQLPart('orderBy');
@@ -888,7 +888,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'));
@@ -908,7 +908,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'));
@@ -928,7 +928,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'));
@@ -1044,7 +1044,7 @@ 
     {
         $qb = $this->_em->createQueryBuilder()
             ->add('select', 'u')
-            ->add('from', CmsUser::class . ' u');
+            ->add('from', CmsUser::class.' u');
 
         $this->assertEquals('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u', $qb->getDQL());
     }