doctrine / orm

tests/Doctrine/Tests/DbalTestCase.php

Spacing +1 added lines, -1 removed lines

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

tests/Doctrine/Tests/OrmFunctionalTestCase.php

Braces +5 added lines, -1 removed lines

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

Spacing +19 added lines, -19 removed lines

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

tests/Doctrine/Tests/ORM/EntityNotFoundExceptionTest.php

Spacing +1 added lines, -1 removed lines

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

tests/Doctrine/Tests/ORM/Utility/IdentifierFlattenerTest.php

Spacing +1 added lines, -1 removed lines

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

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

Spacing +1 added lines, -1 removed lines

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

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

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Mapping;
 
@@ -20,7 +20,7 @@ 
 {
     protected function loadDriver()
     {
-        return new XmlDriver(__DIR__ . DIRECTORY_SEPARATOR . 'xml');
+        return new XmlDriver(__DIR__.DIRECTORY_SEPARATOR.'xml');
     }
 
     public function testClassTableInheritanceDiscriminatorMap()
@@ -162,7 +162,7 @@ 
      */
     public function testValidateXmlSchema($xmlMappingFile)
     {
-        $xsdSchemaFile  = __DIR__ . '/../../../../../doctrine-mapping.xsd';
+        $xsdSchemaFile  = __DIR__.'/../../../../../doctrine-mapping.xsd';
         $dom            = new \DOMDocument('UTF-8');
 
         $dom->load($xmlMappingFile);
@@ -172,7 +172,7 @@ 
 
     static public function dataValidSchema()
     {
-        $list    = glob(__DIR__ . '/xml/*.xml');
+        $list    = glob(__DIR__.'/xml/*.xml');
         $invalid = [
             'Doctrine.Tests.Models.DDC889.DDC889Class.dcm'
         ];
@@ -181,7 +181,7 @@ 
             return ! in_array(pathinfo($item, PATHINFO_FILENAME), $invalid);
         });
 
-        return array_map(function($item){
+        return array_map(function($item) {
             return [$item];
         }, $list);
     }

Unused Use Statements -1 removed lines

@@ -7,7 +7,6 @@
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Mapping\ClassMetadataFactory;
 use Doctrine\ORM\Mapping\Driver\XmlDriver;
-use Doctrine\ORM\Reflection\RuntimeReflectionService;
 use Doctrine\Tests\Models\DDC117\DDC117Translation;
 use Doctrine\Tests\Models\DDC3293\DDC3293User;
 use Doctrine\Tests\Models\DDC3293\DDC3293UserPrefixed;

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

Indentation +1 added lines, -1 removed lines

@@ -1241,7 +1241,7 @@
         $association->setCascade(['invalid']);
 
         $cm->addProperty($association);
-     }
+        }
 
     /**
      * @group DDC-964

Unused Use Statements -1 removed lines

@@ -29,7 +29,6 @@
 use Doctrine\Tests\Models\Routing\RoutingLeg;
 use Doctrine\Tests\OrmTestCase;
 use DoctrineGlobal_Article;
-use SebastianBergmann\Environment\Runtime;
 
 require_once __DIR__ . '/../../Models/Global/GlobalNamespaceModel.php';
 

Spacing +10 added lines, -10 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Mapping;
 
@@ -31,7 +31,7 @@ 
 use DoctrineGlobal_Article;
 use SebastianBergmann\Environment\Runtime;
 
-require_once __DIR__ . '/../../Models/Global/GlobalNamespaceModel.php';
+require_once __DIR__.'/../../Models/Global/GlobalNamespaceModel.php';
 
 class ClassMetadataTest extends OrmTestCase
 {
@@ -804,7 +804,7 @@ 
     public function testEmptyFieldNameThrowsException()
     {
         $this->expectException(MappingException::class);
-        $this->expectExceptionMessage("The field or association mapping misses the 'fieldName' attribute in entity '" . CMS\CmsUser::class . "'.");
+        $this->expectExceptionMessage("The field or association mapping misses the 'fieldName' attribute in entity '".CMS\CmsUser::class."'.");
 
         $cm = new ClassMetadata(CMS\CmsUser::class, $this->metadataBuildingContext);
         $cm->setTable(new Mapping\TableMetadata('cms_users'));
@@ -947,12 +947,12 @@ 
         $mapping = $cm->getSqlResultSetMapping('find-all');
 
         self::assertEquals('__CLASS__', $mapping['entities'][0]['entityClass']);
-        self::assertEquals(['name'=>'id','column'=>'id'], $mapping['entities'][0]['fields'][0]);
-        self::assertEquals(['name'=>'name','column'=>'name'], $mapping['entities'][0]['fields'][1]);
+        self::assertEquals(['name'=>'id', 'column'=>'id'], $mapping['entities'][0]['fields'][0]);
+        self::assertEquals(['name'=>'name', 'column'=>'name'], $mapping['entities'][0]['fields'][1]);
 
         self::assertEquals(CMS\CmsEmail::class, $mapping['entities'][1]['entityClass']);
-        self::assertEquals(['name'=>'id','column'=>'id'], $mapping['entities'][1]['fields'][0]);
-        self::assertEquals(['name'=>'email','column'=>'email'], $mapping['entities'][1]['fields'][1]);
+        self::assertEquals(['name'=>'id', 'column'=>'id'], $mapping['entities'][1]['fields'][0]);
+        self::assertEquals(['name'=>'email', 'column'=>'email'], $mapping['entities'][1]['fields'][1]);
 
         self::assertEquals('scalarColumn', $mapping['columns'][0]['name']);
     }
@@ -1149,7 +1149,7 @@ 
         $cm->addLifecycleCallback('notfound', 'postLoad');
 
         $this->expectException(MappingException::class);
-        $this->expectExceptionMessage("Entity '" . CMS\CmsUser::class . "' has no method 'notfound' to be registered as lifecycle callback.");
+        $this->expectExceptionMessage("Entity '".CMS\CmsUser::class."' has no method 'notfound' to be registered as lifecycle callback.");
 
         $cm->validateLifecycleCallbacks(new RuntimeReflectionService());
     }
@@ -1169,7 +1169,7 @@ 
         $cm->addProperty($association);
 
         $this->expectException(MappingException::class);
-        $this->expectExceptionMessage("The target-entity 'UnknownClass' cannot be found in '" . CMS\CmsUser::class . "#address'.");
+        $this->expectExceptionMessage("The target-entity 'UnknownClass' cannot be found in '".CMS\CmsUser::class."#address'.");
 
         $cm->validateAssociations();
     }
@@ -1510,6 +1510,6 @@ 
      */
     public function propertyToColumnName($propertyName, $className = null)
     {
-        return strtolower($this->classToTableName($className)) . '_' . $propertyName;
+        return strtolower($this->classToTableName($className)).'_'.$propertyName;
     }
 }

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

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;
 
@@ -113,7 +113,7 @@ 
     {
         require_once __DIR__."/../../Models/Global/GlobalNamespaceModel.php";
 
-        $metadataDriver = $this->createAnnotationDriver([__DIR__ . '/../../Models/Global/']);
+        $metadataDriver = $this->createAnnotationDriver([__DIR__.'/../../Models/Global/']);
 
         $entityManager = $this->createEntityManager($metadataDriver);
 
@@ -121,10 +121,10 @@ 
 
         self::assertSame(
             $mf->getMetadataFor(DoctrineGlobal_Article::class),
-            $mf->getMetadataFor('\\' . DoctrineGlobal_Article::class)
+            $mf->getMetadataFor('\\'.DoctrineGlobal_Article::class)
         );
         self::assertTrue($mf->hasMetadataFor(DoctrineGlobal_Article::class));
-        self::assertTrue($mf->hasMetadataFor('\\' . DoctrineGlobal_Article::class));
+        self::assertTrue($mf->hasMetadataFor('\\'.DoctrineGlobal_Article::class));
     }
 
     /**
@@ -175,7 +175,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);
 
@@ -215,7 +215,7 @@ 
     {
         // DDC-3551
         $conn = $this->createMock(Connection::class);
-        $mockDriver    = new MetadataDriverMock();
+        $mockDriver = new MetadataDriverMock();
         $conn->expects($this->any())
             ->method('getEventManager')
             ->willReturn(new EventManager());
@@ -239,10 +239,10 @@ 
         $driverMock = new DriverMock();
         $config = new Configuration();
 
-        $config->setProxyDir(__DIR__ . '/../../Proxies');
+        $config->setProxyDir(__DIR__.'/../../Proxies');
         $config->setProxyNamespace('Doctrine\Tests\Proxies');
 
-        if (!$conn) {
+        if ( ! $conn) {
             $conn = new ConnectionMock([], $driverMock, $config, new EventManager());
         }
         $eventManager = $conn->getEventManager();
@@ -333,7 +333,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);
 
@@ -422,7 +422,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());
@@ -484,7 +484,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);
 

Doc Comments +7 added lines, -1 removed lines

@@ -234,6 +234,9 @@ 
         self::assertEquals([], $metadata);
     }
 
+    /**
+     * @param \PHPUnit\Framework\MockObject\MockObject $conn
+     */
     protected function createEntityManager($metadataDriver, $conn = null)
     {
         $driverMock = new DriverMock();
@@ -265,7 +268,6 @@ 
     }
 
     /**
-     * @param string $class
      * @return ClassMetadata
      */
     protected function createValidClassMetadata()
@@ -515,6 +517,10 @@ 
         return $this->mockMetadata[$className];
     }
 
+    /**
+     * @param string $className
+     * @param ClassMetadata $metadata
+     */
     public function setMetadataForClass($className, $metadata)
     {
         $this->mockMetadata[$className] = $metadata;

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

Indentation +1 added lines, -1 removed lines

@@ -811,7 +811,7 @@
         self::assertEquals($guestGroups->getFetchMode(), $adminGroups->getFetchMode());
         self::assertEquals($guestGroups->getCascade(), $adminGroups->getCascade());
 
-         // assert not override attributes
+            // assert not override attributes
         $guestGroupsJoinTable          = $guestGroups->getJoinTable();
         $guestGroupsJoinColumns        = $guestGroupsJoinTable->getJoinColumns();
         $guestGroupsJoinColumn         = reset($guestGroupsJoinColumns);

Spacing +39 added lines, -39 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Mapping;
 
@@ -683,13 +683,13 @@ 
 
         $findByIdQuery = $class->getNamedNativeQuery('find-by-id');
 
-        self::assertEquals(CmsAddress::class,$findByIdQuery['resultClass']);
-        self::assertEquals('SELECT * FROM cms_addresses WHERE id = ?',  $findByIdQuery['query']);
+        self::assertEquals(CmsAddress::class, $findByIdQuery['resultClass']);
+        self::assertEquals('SELECT * FROM cms_addresses WHERE id = ?', $findByIdQuery['query']);
 
         $countQuery = $class->getNamedNativeQuery('count');
 
         self::assertEquals('mapping-count', $countQuery['resultSetMapping']);
-        self::assertEquals('SELECT COUNT(*) AS count FROM cms_addresses',  $countQuery['query']);
+        self::assertEquals('SELECT COUNT(*) AS count FROM cms_addresses', $countQuery['query']);
 
         // result set mapping
         self::assertCount(3, $class->sqlResultSetMappings);
@@ -700,9 +700,9 @@ 
         $findAllMapping = $class->getSqlResultSetMapping('mapping-find-all');
 
         self::assertEquals(CmsAddress::class, $findAllMapping['entities'][0]['entityClass']);
-        self::assertEquals(['name'=>'id','column'=>'id'], $findAllMapping['entities'][0]['fields'][0]);
-        self::assertEquals(['name'=>'city','column'=>'city'], $findAllMapping['entities'][0]['fields'][1]);
-        self::assertEquals(['name'=>'country','column'=>'country'], $findAllMapping['entities'][0]['fields'][2]);
+        self::assertEquals(['name'=>'id', 'column'=>'id'], $findAllMapping['entities'][0]['fields'][0]);
+        self::assertEquals(['name'=>'city', 'column'=>'city'], $findAllMapping['entities'][0]['fields'][1]);
+        self::assertEquals(['name'=>'country', 'column'=>'country'], $findAllMapping['entities'][0]['fields'][2]);
 
         $withoutFieldsMapping = $class->getSqlResultSetMapping('mapping-without-fields');
 
@@ -728,63 +728,63 @@ 
 
         $mapping = $userMetadata->getSqlResultSetMapping('mappingJoinedAddress');
 
-        self::assertEquals([],$mapping['columns']);
+        self::assertEquals([], $mapping['columns']);
         self::assertEquals('mappingJoinedAddress', $mapping['name']);
 
         self::assertNull($mapping['entities'][0]['discriminatorColumn']);
 
-        self::assertEquals(['name'=>'id','column'=>'id'],                   $mapping['entities'][0]['fields'][0]);
-        self::assertEquals(['name'=>'name','column'=>'name'],               $mapping['entities'][0]['fields'][1]);
-        self::assertEquals(['name'=>'status','column'=>'status'],           $mapping['entities'][0]['fields'][2]);
-        self::assertEquals(['name'=>'address.zip','column'=>'zip'],         $mapping['entities'][0]['fields'][3]);
-        self::assertEquals(['name'=>'address.city','column'=>'city'],       $mapping['entities'][0]['fields'][4]);
-        self::assertEquals(['name'=>'address.country','column'=>'country'], $mapping['entities'][0]['fields'][5]);
-        self::assertEquals(['name'=>'address.id','column'=>'a_id'],         $mapping['entities'][0]['fields'][6]);
-        self::assertEquals('__CLASS__',                            $mapping['entities'][0]['entityClass']);
+        self::assertEquals(['name'=>'id', 'column'=>'id'], $mapping['entities'][0]['fields'][0]);
+        self::assertEquals(['name'=>'name', 'column'=>'name'], $mapping['entities'][0]['fields'][1]);
+        self::assertEquals(['name'=>'status', 'column'=>'status'], $mapping['entities'][0]['fields'][2]);
+        self::assertEquals(['name'=>'address.zip', 'column'=>'zip'], $mapping['entities'][0]['fields'][3]);
+        self::assertEquals(['name'=>'address.city', 'column'=>'city'], $mapping['entities'][0]['fields'][4]);
+        self::assertEquals(['name'=>'address.country', 'column'=>'country'], $mapping['entities'][0]['fields'][5]);
+        self::assertEquals(['name'=>'address.id', 'column'=>'a_id'], $mapping['entities'][0]['fields'][6]);
+        self::assertEquals('__CLASS__', $mapping['entities'][0]['entityClass']);
 
         $mapping = $userMetadata->getSqlResultSetMapping('mappingJoinedPhonenumber');
 
-        self::assertEquals([],$mapping['columns']);
+        self::assertEquals([], $mapping['columns']);
         self::assertEquals('mappingJoinedPhonenumber', $mapping['name']);
 
         self::assertNull($mapping['entities'][0]['discriminatorColumn']);
 
-        self::assertEquals(['name'=>'id','column'=>'id'],                             $mapping['entities'][0]['fields'][0]);
-        self::assertEquals(['name'=>'name','column'=>'name'],                         $mapping['entities'][0]['fields'][1]);
-        self::assertEquals(['name'=>'status','column'=>'status'],                     $mapping['entities'][0]['fields'][2]);
-        self::assertEquals(['name'=>'phonenumbers.phonenumber','column'=>'number'],   $mapping['entities'][0]['fields'][3]);
-        self::assertEquals($userMetadata->getClassName(),                             $mapping['entities'][0]['entityClass']);
+        self::assertEquals(['name'=>'id', 'column'=>'id'], $mapping['entities'][0]['fields'][0]);
+        self::assertEquals(['name'=>'name', 'column'=>'name'], $mapping['entities'][0]['fields'][1]);
+        self::assertEquals(['name'=>'status', 'column'=>'status'], $mapping['entities'][0]['fields'][2]);
+        self::assertEquals(['name'=>'phonenumbers.phonenumber', 'column'=>'number'], $mapping['entities'][0]['fields'][3]);
+        self::assertEquals($userMetadata->getClassName(), $mapping['entities'][0]['entityClass']);
 
         $mapping = $userMetadata->getSqlResultSetMapping('mappingUserPhonenumberCount');
 
-        self::assertEquals(['name'=>'numphones'],$mapping['columns'][0]);
+        self::assertEquals(['name'=>'numphones'], $mapping['columns'][0]);
         self::assertEquals('mappingUserPhonenumberCount', $mapping['name']);
 
         self::assertNull($mapping['entities'][0]['discriminatorColumn']);
 
-        self::assertEquals(['name'=>'id','column'=>'id'],         $mapping['entities'][0]['fields'][0]);
-        self::assertEquals(['name'=>'name','column'=>'name'],     $mapping['entities'][0]['fields'][1]);
-        self::assertEquals(['name'=>'status','column'=>'status'], $mapping['entities'][0]['fields'][2]);
-        self::assertEquals($userMetadata->getClassName(),         $mapping['entities'][0]['entityClass']);
+        self::assertEquals(['name'=>'id', 'column'=>'id'], $mapping['entities'][0]['fields'][0]);
+        self::assertEquals(['name'=>'name', 'column'=>'name'], $mapping['entities'][0]['fields'][1]);
+        self::assertEquals(['name'=>'status', 'column'=>'status'], $mapping['entities'][0]['fields'][2]);
+        self::assertEquals($userMetadata->getClassName(), $mapping['entities'][0]['entityClass']);
 
         $mapping = $userMetadata->getSqlResultSetMapping('mappingMultipleJoinsEntityResults');
 
-        self::assertEquals(['name'=>'numphones'],$mapping['columns'][0]);
+        self::assertEquals(['name'=>'numphones'], $mapping['columns'][0]);
         self::assertEquals('mappingMultipleJoinsEntityResults', $mapping['name']);
 
         self::assertNull($mapping['entities'][0]['discriminatorColumn']);
 
-        self::assertEquals(['name'=>'id','column'=>'u_id'],           $mapping['entities'][0]['fields'][0]);
-        self::assertEquals(['name'=>'name','column'=>'u_name'],       $mapping['entities'][0]['fields'][1]);
-        self::assertEquals(['name'=>'status','column'=>'u_status'],   $mapping['entities'][0]['fields'][2]);
-        self::assertEquals('__CLASS__',                      $mapping['entities'][0]['entityClass']);
+        self::assertEquals(['name'=>'id', 'column'=>'u_id'], $mapping['entities'][0]['fields'][0]);
+        self::assertEquals(['name'=>'name', 'column'=>'u_name'], $mapping['entities'][0]['fields'][1]);
+        self::assertEquals(['name'=>'status', 'column'=>'u_status'], $mapping['entities'][0]['fields'][2]);
+        self::assertEquals('__CLASS__', $mapping['entities'][0]['entityClass']);
 
         self::assertNull($mapping['entities'][1]['discriminatorColumn']);
 
-        self::assertEquals(['name'=>'id','column'=>'a_id'],           $mapping['entities'][1]['fields'][0]);
-        self::assertEquals(['name'=>'zip','column'=>'a_zip'],         $mapping['entities'][1]['fields'][1]);
-        self::assertEquals(['name'=>'country','column'=>'a_country'], $mapping['entities'][1]['fields'][2]);
-        self::assertEquals(CmsAddress::class,                $mapping['entities'][1]['entityClass']);
+        self::assertEquals(['name'=>'id', 'column'=>'a_id'], $mapping['entities'][1]['fields'][0]);
+        self::assertEquals(['name'=>'zip', 'column'=>'a_zip'], $mapping['entities'][1]['fields'][1]);
+        self::assertEquals(['name'=>'country', 'column'=>'a_country'], $mapping['entities'][1]['fields'][2]);
+        self::assertEquals(CmsAddress::class, $mapping['entities'][1]['entityClass']);
 
         //person asserts
         self::assertCount(1, $personMetadata->getSqlResultSetMappings());
@@ -796,9 +796,9 @@ 
 
         self::assertEquals('discriminator', $mapping['entities'][0]['discriminatorColumn']);
 
-        self::assertEquals(['name'=>'id','column'=>'id'],     $mapping['entities'][0]['fields'][0]);
-        self::assertEquals(['name'=>'name','column'=>'name'], $mapping['entities'][0]['fields'][1]);
-        self::assertEquals('__CLASS__',              $mapping['entities'][0]['entityClass']);
+        self::assertEquals(['name'=>'id', 'column'=>'id'], $mapping['entities'][0]['fields'][0]);
+        self::assertEquals(['name'=>'name', 'column'=>'name'], $mapping['entities'][0]['fields'][1]);
+        self::assertEquals('__CLASS__', $mapping['entities'][0]['entityClass']);
     }
 
     /*

Doc Comments -2 removed lines

@@ -83,7 +83,6 @@ 
     }
 
     /**
-     * @param ClassMetadata $class
      */
     public function testEntityTableNameAndInheritance()
     {
@@ -97,7 +96,6 @@ 
 
     /**
      *
-     * @param ClassMetadata $class
      */
     public function testEntityIndexes()
     {