doctrine / orm

lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php

Spacing +13 added lines, -13 removed lines

@@ -105,7 +105,7 @@ 
      */
     protected function onNotFoundMetadata($className)
     {
-        if (! $this->evm->hasListeners(Events::onClassMetadataNotFound)) {
+        if ( ! $this->evm->hasListeners(Events::onClassMetadataNotFound)) {
             return;
         }
 
@@ -162,7 +162,7 @@ 
             $this->completeIdGeneratorMapping($class);
         }
 
-        if (!$class->isMappedSuperclass) {
+        if ( ! $class->isMappedSuperclass) {
             foreach ($class->embeddedClasses as $property => $embeddableClass) {
 
                 if (isset($embeddableClass['inherited'])) {
@@ -187,7 +187,7 @@ 
 
                 $identifier = $embeddableMetadata->getIdentifier();
 
-                if (! empty($identifier)) {
+                if ( ! empty($identifier)) {
                     $this->inheritIdGeneratorMapping($class, $embeddableMetadata);
                 }
 
@@ -257,7 +257,7 @@ 
      */
     protected function validateRuntimeMetadata($class, $parent)
     {
-        if ( ! $class->reflClass ) {
+        if ( ! $class->reflClass) {
             // only validate if there is a reflection class instance
             return;
         }
@@ -267,7 +267,7 @@ 
         $class->validateLifecycleCallbacks($this->getReflectionService());
 
         // verify inheritance
-        if ( ! $class->isMappedSuperclass && !$class->isInheritanceTypeNone()) {
+        if ( ! $class->isMappedSuperclass && ! $class->isInheritanceTypeNone()) {
             if ( ! $parent) {
                 if (count($class->discriminatorMap) == 0) {
                     throw MappingException::missingDiscriminatorMap($class->name);
@@ -428,7 +428,7 @@ 
     {
         foreach ($parentClass->associationMappings as $field => $mapping) {
             if ($parentClass->isMappedSuperclass) {
-                if ($mapping['type'] & ClassMetadata::TO_MANY && !$mapping['isOwningSide']) {
+                if ($mapping['type'] & ClassMetadata::TO_MANY && ! $mapping['isOwningSide']) {
                     throw MappingException::illegalToManyAssociationOnMappedSuperclass($parentClass->name, $field);
                 }
                 $mapping['sourceEntity'] = $subClass->name;
@@ -477,11 +477,11 @@ 
 
             $parentClass->mapEmbedded(
                 [
-                    'fieldName' => $prefix . '.' . $property,
+                    'fieldName' => $prefix.'.'.$property,
                     'class' => $embeddableMetadata->name,
                     'columnPrefix' => $embeddableClass['columnPrefix'],
                     'declaredField' => $embeddableClass['declaredField']
-                            ? $prefix . '.' . $embeddableClass['declaredField']
+                            ? $prefix.'.'.$embeddableClass['declaredField']
                             : $prefix,
                     'originalField' => $embeddableClass['originalField'] ?: $property,
                 ]
@@ -499,7 +499,7 @@ 
      */
     private function addInheritedIndexes(ClassMetadata $subClass, ClassMetadata $parentClass)
     {
-        if (! $parentClass->isMappedSuperclass) {
+        if ( ! $parentClass->isMappedSuperclass) {
             return;
         }
 
@@ -704,14 +704,14 @@ 
             case ClassMetadata::GENERATOR_TYPE_CUSTOM:
                 $definition = $class->customGeneratorDefinition;
                 if ( ! class_exists($definition['class'])) {
-                    throw new ORMException("Can't instantiate custom generator : " .
+                    throw new ORMException("Can't instantiate custom generator : ".
                         $definition['class']);
                 }
                 $class->setIdGenerator(new $definition['class']);
                 break;
 
             default:
-                throw new ORMException("Unknown generator type: " . $class->generatorType);
+                throw new ORMException("Unknown generator type: ".$class->generatorType);
         }
     }
 
@@ -761,7 +761,7 @@ 
      */
     protected function getFqcnFromAlias($namespaceAlias, $simpleClassName)
     {
-        return $this->em->getConfiguration()->getEntityNamespace($namespaceAlias) . '\\' . $simpleClassName;
+        return $this->em->getConfiguration()->getEntityNamespace($namespaceAlias).'\\'.$simpleClassName;
     }
 
     /**
@@ -785,7 +785,7 @@ 
      */
     private function getTargetPlatform()
     {
-        if (!$this->targetPlatform) {
+        if ( ! $this->targetPlatform) {
             $this->targetPlatform = $this->em->getConnection()->getDatabasePlatform();
         }
 

lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php

Spacing +5 added lines, -5 removed lines

@@ -41,7 +41,7 @@ 
     public function exportClassMetadata(ClassMetadataInfo $metadata)
     {
         $xml = new \SimpleXmlElement("<?xml version=\"1.0\" encoding=\"utf-8\"?><doctrine-mapping ".
-            "xmlns=\"http://doctrine-project.org/schemas/orm/doctrine-mapping\" " .
+            "xmlns=\"http://doctrine-project.org/schemas/orm/doctrine-mapping\" ".
             "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" ".
             "xsi:schemaLocation=\"http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd\" />");
 
@@ -97,7 +97,7 @@ 
 
         $trackingPolicy = $this->_getChangeTrackingPolicyString($metadata->changeTrackingPolicy);
 
-        if ( $trackingPolicy != 'DEFERRED_IMPLICIT') {
+        if ($trackingPolicy != 'DEFERRED_IMPLICIT') {
             $root->addChild('change-tracking-policy', $trackingPolicy);
         }
 
@@ -295,7 +295,7 @@ 
             }
 
             if (count($cascade) === 5) {
-                $cascade  = ['cascade-all'];
+                $cascade = ['cascade-all'];
             }
 
             if ($cascade) {
@@ -377,7 +377,7 @@ 
             }
         }
 
-        if (isset($metadata->lifecycleCallbacks) && count($metadata->lifecycleCallbacks)>0) {
+        if (isset($metadata->lifecycleCallbacks) && count($metadata->lifecycleCallbacks) > 0) {
             $lifecycleCallbacksXml = $root->addChild('lifecycle-callbacks');
 
             foreach ($metadata->lifecycleCallbacks as $name => $methods) {
@@ -426,7 +426,7 @@ 
     {
         $sequenceDefinition = $metadata->sequenceGeneratorDefinition;
 
-        if (! ($metadata->generatorType === ClassMetadataInfo::GENERATOR_TYPE_SEQUENCE && $sequenceDefinition)) {
+        if ( ! ($metadata->generatorType === ClassMetadataInfo::GENERATOR_TYPE_SEQUENCE && $sequenceDefinition)) {
             return;
         }
 

lib/Doctrine/ORM/Cache/DefaultCacheFactory.php

Spacing +4 added lines, -4 removed lines

@@ -212,12 +212,12 @@ 
 
             if ( ! $this->fileLockRegionDirectory) {
                 throw new \LogicException(
-                    'If you want to use a "READ_WRITE" cache an implementation of "Doctrine\ORM\Cache\ConcurrentRegion" is required, ' .
+                    'If you want to use a "READ_WRITE" cache an implementation of "Doctrine\ORM\Cache\ConcurrentRegion" is required, '.
                     'The default implementation provided by doctrine is "Doctrine\ORM\Cache\Region\FileLockRegion" if you want to use it please provide a valid directory, DefaultCacheFactory#setFileLockRegionDirectory(). '
                 );
             }
 
-            $directory = $this->fileLockRegionDirectory . DIRECTORY_SEPARATOR . $cache['region'];
+            $directory = $this->fileLockRegionDirectory.DIRECTORY_SEPARATOR.$cache['region'];
             $region    = new FileLockRegion($region, $directory, $this->regionsConfig->getLockLifetime($cache['region']));
         }
 
@@ -233,7 +233,7 @@ 
     {
         $cacheAdapter = clone $this->cache;
 
-        if (!$cacheAdapter instanceof CacheProvider) {
+        if ( ! $cacheAdapter instanceof CacheProvider) {
             return $cacheAdapter;
         }
 
@@ -243,7 +243,7 @@ 
             $namespace .= ':';
         }
 
-        $cacheAdapter->setNamespace($namespace . $name);
+        $cacheAdapter->setNamespace($namespace.$name);
 
         return $cacheAdapter;
     }

lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php

Unused Use Statements -2 removed lines

@@ -20,10 +20,8 @@
 namespace Doctrine\ORM\Persisters\Entity;
 
 use Doctrine\ORM\Mapping\ClassMetadata;
-
 use Doctrine\DBAL\LockMode;
 use Doctrine\DBAL\Types\Type;
-
 use Doctrine\Common\Collections\Criteria;
 use Doctrine\ORM\Utility\PersisterHelper;
 

Spacing +19 added lines, -19 removed lines

@@ -207,7 +207,7 @@ 
                 }
 
                 foreach ($data as $columnName => $value) {
-                    if (!is_array($id) || !isset($id[$columnName])) {
+                    if ( ! is_array($id) || ! isset($id[$columnName])) {
                         $stmt->bindValue($paramIndex++, $value, $this->columnTypes[$columnName]);
                     }
                 }
@@ -322,7 +322,7 @@ 
         // If the current class in the root entity, add the filters
         if ($filterSql = $this->generateFilterConditionSQL($this->em->getClassMetadata($this->class->rootEntityName), $this->getSQLTableAlias($this->class->rootEntityName))) {
             $conditionSql .= $conditionSql
-                ? ' AND ' . $filterSql
+                ? ' AND '.$filterSql
                 : $filterSql;
         }
 
@@ -341,29 +341,29 @@ 
         switch ($lockMode) {
             case LockMode::PESSIMISTIC_READ:
 
-                $lockSql = ' ' . $this->platform->getReadLockSQL();
+                $lockSql = ' '.$this->platform->getReadLockSQL();
 
                 break;
 
             case LockMode::PESSIMISTIC_WRITE:
 
-                $lockSql = ' ' . $this->platform->getWriteLockSQL();
+                $lockSql = ' '.$this->platform->getWriteLockSQL();
 
                 break;
         }
 
         $tableName  = $this->quoteStrategy->getTableName($this->class, $this->platform);
-        $from       = ' FROM ' . $tableName . ' ' . $baseTableAlias;
-        $where      = $conditionSql != '' ? ' WHERE ' . $conditionSql : '';
+        $from       = ' FROM '.$tableName.' '.$baseTableAlias;
+        $where      = $conditionSql != '' ? ' WHERE '.$conditionSql : '';
         $lock       = $this->platform->appendLockHint($from, $lockMode);
         $columnList = $this->getSelectColumnsSQL();
-        $query      = 'SELECT '  . $columnList
+        $query      = 'SELECT '.$columnList
                     . $lock
                     . $joinSql
                     . $where
                     . $orderBySql;
 
-        return $this->platform->modifyLimitQuery($query, $limit, $offset) . $lockSql;
+        return $this->platform->modifyLimitQuery($query, $limit, $offset).$lockSql;
     }
 
     /**
@@ -383,14 +383,14 @@ 
 
         if ('' !== $filterSql) {
             $conditionSql = $conditionSql
-                ? $conditionSql . ' AND ' . $filterSql
+                ? $conditionSql.' AND '.$filterSql
                 : $filterSql;
         }
 
         $sql = 'SELECT COUNT(*) '
-            . 'FROM ' . $tableName . ' ' . $baseTableAlias
+            . 'FROM '.$tableName.' '.$baseTableAlias
             . $joinSql
-            . (empty($conditionSql) ? '' : ' WHERE ' . $conditionSql);
+            . (empty($conditionSql) ? '' : ' WHERE '.$conditionSql);
 
         return $sql;
     }
@@ -409,16 +409,16 @@ 
             $conditions     = [];
             $tableAlias     = $this->getSQLTableAlias($parentClassName);
             $parentClass    = $this->em->getClassMetadata($parentClassName);
-            $joinSql       .= ' INNER JOIN ' . $this->quoteStrategy->getTableName($parentClass, $this->platform) . ' ' . $tableAlias . ' ON ';
+            $joinSql       .= ' INNER JOIN '.$this->quoteStrategy->getTableName($parentClass, $this->platform).' '.$tableAlias.' ON ';
 
             foreach ($identifierColumns as $idColumn) {
-                $conditions[] = $baseTableAlias . '.' . $idColumn . ' = ' . $tableAlias . '.' . $idColumn;
+                $conditions[] = $baseTableAlias.'.'.$idColumn.' = '.$tableAlias.'.'.$idColumn;
             }
 
             $joinSql .= implode(' AND ', $conditions);
         }
 
-        return parent::getLockTablesSql($lockMode) . $joinSql;
+        return parent::getLockTablesSql($lockMode).$joinSql;
     }
 
     /**
@@ -479,7 +479,7 @@ 
             ? $baseTableAlias
             : $this->getSQLTableAlias($this->class->rootEntityName);
 
-        $columnList[] = $tableAlias . '.' . $discrColumn;
+        $columnList[] = $tableAlias.'.'.$discrColumn;
 
         // sub tables
         foreach ($this->class->subClasses as $subClassName) {
@@ -586,11 +586,11 @@ 
             $conditions   = [];
             $parentClass  = $this->em->getClassMetadata($parentClassName);
             $tableAlias   = $this->getSQLTableAlias($parentClassName);
-            $joinSql     .= ' INNER JOIN ' . $this->quoteStrategy->getTableName($parentClass, $this->platform) . ' ' . $tableAlias . ' ON ';
+            $joinSql     .= ' INNER JOIN '.$this->quoteStrategy->getTableName($parentClass, $this->platform).' '.$tableAlias.' ON ';
 
 
             foreach ($identifierColumn as $idColumn) {
-                $conditions[] = $baseTableAlias . '.' . $idColumn . ' = ' . $tableAlias . '.' . $idColumn;
+                $conditions[] = $baseTableAlias.'.'.$idColumn.' = '.$tableAlias.'.'.$idColumn;
             }
 
             $joinSql .= implode(' AND ', $conditions);
@@ -601,10 +601,10 @@ 
             $conditions  = [];
             $subClass    = $this->em->getClassMetadata($subClassName);
             $tableAlias  = $this->getSQLTableAlias($subClassName);
-            $joinSql    .= ' LEFT JOIN ' . $this->quoteStrategy->getTableName($subClass, $this->platform) . ' ' . $tableAlias . ' ON ';
+            $joinSql    .= ' LEFT JOIN '.$this->quoteStrategy->getTableName($subClass, $this->platform).' '.$tableAlias.' ON ';
 
             foreach ($identifierColumn as $idColumn) {
-                $conditions[] = $baseTableAlias . '.' . $idColumn . ' = ' . $tableAlias . '.' . $idColumn;
+                $conditions[] = $baseTableAlias.'.'.$idColumn.' = '.$tableAlias.'.'.$idColumn;
             }
 
             $joinSql .= implode(' AND ', $conditions);

tests/Doctrine/Tests/Mocks/UnitOfWorkMock.php

Doc Comments +1 added lines

@@ -31,6 +31,7 @@
 
     /**
      * {@inheritdoc}
+     * @param \Doctrine\Tests\ORM\NotifyChangedEntity $entity
      */
     public function & getEntityChangeSet($entity)
     {

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

Doc Comments +12 added lines

@@ -146,6 +146,12 @@ 
         return [$user1, $user2, $user3];
     }
 
+    /**
+     * @param string $name
+     * @param string $username
+     * @param string $status
+     * @param CmsAddress $address
+     */
     public function buildUser($name, $username, $status, $address)
     {
         $user = new CmsUser();
@@ -160,6 +166,12 @@ 
         return $user;
     }
 
+    /**
+     * @param string $country
+     * @param string $city
+     * @param string $street
+     * @param string $zip
+     */
     public function buildAddress($country, $city, $street, $zip)
     {
         $address = new CmsAddress();

Indentation +10 added lines, -10 removed lines

@@ -308,7 +308,7 @@ 
      */
     public function testExceptionIsThrownWhenCallingFindByWithoutParameter() {
         $this->_em->getRepository(CmsUser::class)
-                  ->findByStatus();
+                    ->findByStatus();
     }
 
     /**
@@ -316,7 +316,7 @@ 
      */
     public function testExceptionIsThrownWhenUsingInvalidFieldName() {
         $this->_em->getRepository(CmsUser::class)
-                  ->findByThisFieldDoesNotExist('testvalue');
+                    ->findByThisFieldDoesNotExist('testvalue');
     }
 
     /**
@@ -328,7 +328,7 @@ 
         $this->expectException(TransactionRequiredException::class);
 
         $this->_em->getRepository(CmsUser::class)
-                  ->find(1, LockMode::PESSIMISTIC_READ);
+                    ->find(1, LockMode::PESSIMISTIC_READ);
     }
 
     /**
@@ -340,7 +340,7 @@ 
         $this->expectException(TransactionRequiredException::class);
 
         $this->_em->getRepository(CmsUser::class)
-                  ->find(1, LockMode::PESSIMISTIC_WRITE);
+                    ->find(1, LockMode::PESSIMISTIC_WRITE);
     }
 
     /**
@@ -352,7 +352,7 @@ 
         $this->expectException(OptimisticLockException::class);
 
         $this->_em->getRepository(CmsUser::class)
-                  ->find(1, LockMode::OPTIMISTIC);
+                    ->find(1, LockMode::OPTIMISTIC);
     }
 
     /**
@@ -433,13 +433,13 @@ 
      */
     public function testFindOneByOrderBy()
     {
-    	$this->loadFixture();
+        $this->loadFixture();
 
-    	$repos = $this->_em->getRepository(CmsUser::class);
-    	$userAsc = $repos->findOneBy([], ["username" => "ASC"]);
-    	$userDesc = $repos->findOneBy([], ["username" => "DESC"]);
+        $repos = $this->_em->getRepository(CmsUser::class);
+        $userAsc = $repos->findOneBy([], ["username" => "ASC"]);
+        $userDesc = $repos->findOneBy([], ["username" => "DESC"]);
 
-    	$this->assertNotSame($userAsc, $userDesc);
+        $this->assertNotSame($userAsc, $userDesc);
     }
 
     /**

Spacing +8 added lines, -8 removed lines

@@ -180,7 +180,7 @@ 
         $repos = $this->_em->getRepository(CmsUser::class);
 
         $user = $repos->find($user1Id);
-        $this->assertInstanceOf(CmsUser::class,$user);
+        $this->assertInstanceOf(CmsUser::class, $user);
         $this->assertEquals('Roman', $user->name);
         $this->assertEquals('freak', $user->status);
     }
@@ -192,7 +192,7 @@ 
 
         $users = $repos->findBy(['status' => 'dev']);
         $this->assertEquals(2, count($users));
-        $this->assertInstanceOf(CmsUser::class,$users[0]);
+        $this->assertInstanceOf(CmsUser::class, $users[0]);
         $this->assertEquals('Guilherme', $users[0]->name);
         $this->assertEquals('dev', $users[0]->status);
     }
@@ -218,7 +218,7 @@ 
         $addresses  = $repository->findBy(['user' => [$user1->getId(), $user2->getId()]]);
 
         $this->assertEquals(2, count($addresses));
-        $this->assertInstanceOf(CmsAddress::class,$addresses[0]);
+        $this->assertInstanceOf(CmsAddress::class, $addresses[0]);
     }
 
     public function testFindByAssociationWithObjectAsParameter()
@@ -242,7 +242,7 @@ 
         $addresses  = $repository->findBy(['user' => [$user1, $user2]]);
 
         $this->assertEquals(2, count($addresses));
-        $this->assertInstanceOf(CmsAddress::class,$addresses[0]);
+        $this->assertInstanceOf(CmsAddress::class, $addresses[0]);
     }
 
     public function testFindFieldByMagicCall()
@@ -252,7 +252,7 @@ 
 
         $users = $repos->findByStatus('dev');
         $this->assertEquals(2, count($users));
-        $this->assertInstanceOf(CmsUser::class,$users[0]);
+        $this->assertInstanceOf(CmsUser::class, $users[0]);
         $this->assertEquals('Guilherme', $users[0]->name);
         $this->assertEquals('dev', $users[0]->status);
     }
@@ -592,7 +592,7 @@ 
         $this->assertEquals(2, count($usersAsc));
         $this->assertEquals(2, count($usersDesc));
 
-        $this->assertInstanceOf(CmsUser::class,$usersAsc[0]);
+        $this->assertInstanceOf(CmsUser::class, $usersAsc[0]);
         $this->assertEquals('Alexander', $usersAsc[0]->name);
         $this->assertEquals('dev', $usersAsc[0]->status);
 
@@ -673,7 +673,7 @@ 
     public function testCanRetrieveRepositoryFromClassNameWithLeadingBackslash()
     {
         $this->assertSame(
-            $this->_em->getRepository('\\' . CmsUser::class),
+            $this->_em->getRepository('\\'.CmsUser::class),
             $this->_em->getRepository(CmsUser::class)
         );
     }
@@ -711,7 +711,7 @@ 
         $data = $repo->findBy(['user' => [1, 2, 3]]);
 
         $query = array_pop($this->_sqlLoggerStack->queries);
-        $this->assertEquals([1,2,3], $query['params'][0]);
+        $this->assertEquals([1, 2, 3], $query['params'][0]);
         $this->assertEquals(Connection::PARAM_INT_ARRAY, $query['types'][0]);
     }
 

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();