doctrine / orm

tests/Doctrine/Tests/ORM/Tools/Console/Command/ClearCacheCollectionRegionCommandTest.php

Spacing +4 added lines, -4 removed lines

@@ -53,7 +53,7 @@ 
             ], ['decorated' => false]
         );
 
-        self::assertEquals('Clearing all second-level cache collection regions' . PHP_EOL, $tester->getDisplay());
+        self::assertEquals('Clearing all second-level cache collection regions'.PHP_EOL, $tester->getDisplay());
     }
 
     public function testClearByOwnerEntityClassName()
@@ -68,7 +68,7 @@ 
             ], ['decorated' => false]
         );
 
-        self::assertEquals('Clearing second-level cache for collection "Doctrine\Tests\Models\Cache\State#cities"' . PHP_EOL, $tester->getDisplay());
+        self::assertEquals('Clearing second-level cache for collection "Doctrine\Tests\Models\Cache\State#cities"'.PHP_EOL, $tester->getDisplay());
     }
 
     public function testClearCacheEntryName()
@@ -84,7 +84,7 @@ 
             ], ['decorated' => false]
         );
 
-        self::assertEquals('Clearing second-level cache entry for collection "Doctrine\Tests\Models\Cache\State#cities" owner entity identified by "1"' . PHP_EOL, $tester->getDisplay());
+        self::assertEquals('Clearing second-level cache entry for collection "Doctrine\Tests\Models\Cache\State#cities" owner entity identified by "1"'.PHP_EOL, $tester->getDisplay());
     }
 
     public function testFlushRegionName()
@@ -100,6 +100,6 @@ 
             ], ['decorated' => false]
         );
 
-        self::assertEquals('Flushing cache provider configured for "Doctrine\Tests\Models\Cache\State#cities"' . PHP_EOL, $tester->getDisplay());
+        self::assertEquals('Flushing cache provider configured for "Doctrine\Tests\Models\Cache\State#cities"'.PHP_EOL, $tester->getDisplay());
     }
 }

tests/Doctrine/Tests/ORM/Tools/Console/Command/ClearCacheEntityRegionCommandTest.php

Spacing +4 added lines, -4 removed lines

@@ -53,7 +53,7 @@ 
             ], ['decorated' => false]
         );
 
-        self::assertEquals('Clearing all second-level cache entity regions' . PHP_EOL, $tester->getDisplay());
+        self::assertEquals('Clearing all second-level cache entity regions'.PHP_EOL, $tester->getDisplay());
     }
 
     public function testClearByEntityClassName()
@@ -67,7 +67,7 @@ 
             ], ['decorated' => false]
         );
 
-        self::assertEquals('Clearing second-level cache for entity "Doctrine\Tests\Models\Cache\Country"' . PHP_EOL, $tester->getDisplay());
+        self::assertEquals('Clearing second-level cache for entity "Doctrine\Tests\Models\Cache\Country"'.PHP_EOL, $tester->getDisplay());
     }
 
     public function testClearCacheEntryName()
@@ -82,7 +82,7 @@ 
             ], ['decorated' => false]
         );
 
-        self::assertEquals('Clearing second-level cache entry for entity "Doctrine\Tests\Models\Cache\Country" identified by "1"' . PHP_EOL, $tester->getDisplay());
+        self::assertEquals('Clearing second-level cache entry for entity "Doctrine\Tests\Models\Cache\Country" identified by "1"'.PHP_EOL, $tester->getDisplay());
     }
 
     public function testFlushRegionName()
@@ -97,6 +97,6 @@ 
             ], ['decorated' => false]
         );
 
-        self::assertEquals('Flushing cache provider configured for entity named "Doctrine\Tests\Models\Cache\Country"' . PHP_EOL, $tester->getDisplay());
+        self::assertEquals('Flushing cache provider configured for entity named "Doctrine\Tests\Models\Cache\Country"'.PHP_EOL, $tester->getDisplay());
     }
 }

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

Spacing +13 added lines, -13 removed lines

@@ -41,7 +41,7 @@ 
     {
         $driverMock = new DriverMock();
         $config = new Configuration();
-        $config->setProxyDir(__DIR__ . '/../../Proxies');
+        $config->setProxyDir(__DIR__.'/../../Proxies');
         $config->setProxyNamespace('Doctrine\Tests\Proxies');
         $eventManager = new EventManager();
         $conn = new ConnectionMock([], $driverMock, $config, $eventManager);
@@ -59,7 +59,7 @@ 
             'yaml'       => YamlDriver::class,
         ];
 
-        self::assertArrayHasKey($type, $mappingDriver, "There is no metadata driver for the type '" . $type . "'.");
+        self::assertArrayHasKey($type, $mappingDriver, "There is no metadata driver for the type '".$type."'.");
 
         $class  = $mappingDriver[$type];
         $driver = ($type === 'annotation')
@@ -82,10 +82,10 @@ 
 
     public function testExportDirectoryAndFilesAreCreated()
     {
-        $this->_deleteDirectory(__DIR__ . '/export/'.$this->_getType());
+        $this->_deleteDirectory(__DIR__.'/export/'.$this->_getType());
 
         $type = $this->_getType();
-        $metadataDriver = $this->_createMetadataDriver($type, __DIR__ . '/' . $type);
+        $metadataDriver = $this->_createMetadataDriver($type, __DIR__.'/'.$type);
         $em = $this->_createEntityManager($metadataDriver);
         $cmf = $this->_createClassMetadataFactory($em, $type);
         $metadata = $cmf->getAllMetadata();
@@ -96,7 +96,7 @@ 
 
         $type = $this->_getType();
         $cme = new ClassMetadataExporter();
-        $exporter = $cme->getExporter($type, __DIR__ . '/export/' . $type);
+        $exporter = $cme->getExporter($type, __DIR__.'/export/'.$type);
 
         if ($type === 'annotation') {
             $entityGenerator = new EntityGenerator();
@@ -111,9 +111,9 @@ 
         $exporter->export();
 
         if ($type == 'annotation') {
-            self::assertTrue(file_exists(__DIR__ . '/export/' . $type . '/'.str_replace('\\', '/', ExportedUser::class).$this->_extension));
+            self::assertTrue(file_exists(__DIR__.'/export/'.$type.'/'.str_replace('\\', '/', ExportedUser::class).$this->_extension));
         } else {
-            self::assertTrue(file_exists(__DIR__ . '/export/' . $type . '/Doctrine.Tests.ORM.Tools.Export.ExportedUser'.$this->_extension));
+            self::assertTrue(file_exists(__DIR__.'/export/'.$type.'/Doctrine.Tests.ORM.Tools.Export.ExportedUser'.$this->_extension));
         }
     }
 
@@ -124,7 +124,7 @@ 
     {
         $type = $this->_getType();
 
-        $metadataDriver = $this->_createMetadataDriver($type, __DIR__ . '/export/' . $type);
+        $metadataDriver = $this->_createMetadataDriver($type, __DIR__.'/export/'.$type);
         $em = $this->_createEntityManager($metadataDriver);
         $cmf = $this->_createClassMetadataFactory($em, $type);
         $metadata = $cmf->getAllMetadata();
@@ -210,7 +210,7 @@ 
         $type = $this->_getType();
 
         if ($type == 'xml') {
-            $xml = simplexml_load_file(__DIR__ . '/export/'.$type.'/Doctrine.Tests.ORM.Tools.Export.ExportedUser.dcm.xml');
+            $xml = simplexml_load_file(__DIR__.'/export/'.$type.'/Doctrine.Tests.ORM.Tools.Export.ExportedUser.dcm.xml');
 
             $xml->registerXPathNamespace("d", "http://doctrine-project.org/schemas/orm/doctrine-mapping");
             $nodes = $xml->xpath("/d:doctrine-mapping/d:entity/d:field[@name='name' and @type='string' and @nullable='true']");
@@ -354,7 +354,7 @@ 
         $type = $this->_getType();
 
         if ($type == 'xml') {
-            $xml = simplexml_load_file(__DIR__ . '/export/'.$type.'/Doctrine.Tests.ORM.Tools.Export.ExportedUser.dcm.xml');
+            $xml = simplexml_load_file(__DIR__.'/export/'.$type.'/Doctrine.Tests.ORM.Tools.Export.ExportedUser.dcm.xml');
 
             $xml->registerXPathNamespace("d", "http://doctrine-project.org/schemas/orm/doctrine-mapping");
             $nodes = $xml->xpath("/d:doctrine-mapping/d:entity/d:one-to-many[@field='interests']/d:cascade/d:*");
@@ -363,7 +363,7 @@ 
             self::assertEquals('cascade-all', $nodes[0]->getName());
         } else if ($type == 'yaml') {
             $yaml = new Parser();
-            $value = $yaml->parse(file_get_contents(__DIR__ . '/export/'.$type.'/Doctrine.Tests.ORM.Tools.Export.ExportedUser.dcm.yml'));
+            $value = $yaml->parse(file_get_contents(__DIR__.'/export/'.$type.'/Doctrine.Tests.ORM.Tools.Export.ExportedUser.dcm.yml'));
 
             self::assertTrue(isset($value[ExportedUser::class]['oneToMany']['interests']['cascade']));
             self::assertEquals(1, count($value[ExportedUser::class]['oneToMany']['interests']['cascade']));
@@ -403,10 +403,10 @@ 
         if (is_file($path)) {
             return unlink($path);
         } else if (is_dir($path)) {
-            $files = glob(rtrim($path,'/').'/*');
+            $files = glob(rtrim($path, '/').'/*');
 
             if (is_array($files)) {
-                foreach ($files as $file){
+                foreach ($files as $file) {
                     $this->_deleteDirectory($file);
                 }
             }

tests/Doctrine/Tests/ORM/QueryBuilderTest.php

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');
 
         self::assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE (((u.id = :uid OR u.id = :uid2) AND u.id = :uid3) OR u.name = :name1 OR u.name = :name2) AND u.name <> :noname');
     }
@@ -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]));
 
         self::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]));
 
         self::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]));
 
         self::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]));
 
         self::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'));
 
         self::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);
 
         self::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']));
 
         self::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')]));
 
         self::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);
 
         self::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')));
 
         self::assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id > ALL(select a.id from Doctrine\Tests\Models\CMS\CmsArticle a)');
 
@@ -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');
 
-        self::assertEquals('u.username = ?1', (string)$qb->getDQLPart('where'));
+        self::assertEquals('u.username = ?1', (string) $qb->getDQLPart('where'));
         self::assertEquals(1, count($qb->getDQLPart('orderBy')));
 
         $qb->resetDQLPart('where')->resetDQLPart('orderBy');
@@ -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');
 
         self::assertEquals('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u', $qb->getDQL());
     }

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

Spacing +4 added lines, -4 removed lines

@@ -68,8 +68,8 @@ 
         $cm->mapField(['fieldName' => 'name', 'columnName' => '`name`']);
         $cm->mapField(['fieldName' => 'id', 'columnName' => 'id']);
 
-        self::assertEquals('id' ,$this->strategy->getColumnName('id', $cm, $this->platform));
-        self::assertEquals('"name"' ,$this->strategy->getColumnName('name', $cm, $this->platform));
+        self::assertEquals('id', $this->strategy->getColumnName('id', $cm, $this->platform));
+        self::assertEquals('"name"', $this->strategy->getColumnName('name', $cm, $this->platform));
     }
 
     public function testGetTableName()
@@ -189,7 +189,7 @@ 
         );
 
         $joinColumn = $cm->associationMappings['article']['joinColumns'][0];
-        self::assertEquals('"article"',$this->strategy->getJoinColumnName($joinColumn, $cm, $this->platform));
+        self::assertEquals('"article"', $this->strategy->getJoinColumnName($joinColumn, $cm, $this->platform));
     }
 
     public function testReferencedJoinColumnName()
@@ -210,7 +210,7 @@ 
         );
 
         $joinColumn = $cm->associationMappings['article']['joinColumns'][0];
-        self::assertEquals('"id"',$this->strategy->getReferencedJoinColumnName($joinColumn, $cm, $this->platform));
+        self::assertEquals('"id"', $this->strategy->getReferencedJoinColumnName($joinColumn, $cm, $this->platform));
     }
 }
 

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

Indentation +79 added lines, -79 removed lines

@@ -739,7 +739,7 @@ 
         self::assertEquals($guestGroups['isCascadeMerge'], $adminGroups['isCascadeMerge']);
         self::assertEquals($guestGroups['isCascadeDetach'], $adminGroups['isCascadeDetach']);
 
-         // assert not override attributes
+            // assert not override attributes
         self::assertEquals('ddc964_users_groups', $guestGroups['joinTable']['name']);
         self::assertEquals('user_id', $guestGroups['joinTable']['joinColumns'][0]['name']);
         self::assertEquals('group_id', $guestGroups['joinTable']['inverseJoinColumns'][0]['name']);
@@ -1166,8 +1166,8 @@ 
         $metadata->setInheritanceType(ClassMetadataInfo::INHERITANCE_TYPE_NONE);
         $metadata->setPrimaryTable(
             [
-           'name' => 'cms_users',
-           'options' => ['foo' => 'bar', 'baz' => ['key' => 'val']],
+            'name' => 'cms_users',
+            'options' => ['foo' => 'bar', 'baz' => ['key' => 'val']],
             ]
         );
         $metadata->setChangeTrackingPolicy(ClassMetadataInfo::CHANGETRACKING_DEFERRED_IMPLICIT);
@@ -1176,30 +1176,30 @@ 
         $metadata->addLifecycleCallback('doStuffOnPostPersist', 'postPersist');
         $metadata->mapField(
             [
-           'id' => true,
-           'fieldName' => 'id',
-           'type' => 'integer',
-           'columnName' => 'id',
-           'options' => ['foo' => 'bar', 'unsigned' => false],
+            'id' => true,
+            'fieldName' => 'id',
+            'type' => 'integer',
+            'columnName' => 'id',
+            'options' => ['foo' => 'bar', 'unsigned' => false],
             ]
         );
         $metadata->mapField(
             [
-           'fieldName' => 'name',
-           'type' => 'string',
-           'length' => 50,
-           'unique' => true,
-           'nullable' => true,
-           'columnName' => 'name',
-           'options' => ['foo' => 'bar', 'baz' => ['key' => 'val'], 'fixed' => false],
+            'fieldName' => 'name',
+            'type' => 'string',
+            'length' => 50,
+            'unique' => true,
+            'nullable' => true,
+            'columnName' => 'name',
+            'options' => ['foo' => 'bar', 'baz' => ['key' => 'val'], 'fixed' => false],
             ]
         );
         $metadata->mapField(
             [
-           'fieldName' => 'email',
-           'type' => 'string',
-           'columnName' => 'user_email',
-           'columnDefinition' => 'CHAR(32) NOT NULL',
+            'fieldName' => 'email',
+            'type' => 'string',
+            'columnName' => 'user_email',
+            'columnDefinition' => 'CHAR(32) NOT NULL',
             ]
         );
         $mapping = ['fieldName' => 'version', 'type' => 'integer'];
@@ -1208,60 +1208,60 @@ 
         $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_AUTO);
         $metadata->mapOneToOne(
             [
-           'fieldName' => 'address',
-           'targetEntity' => Address::class,
-           'cascade' =>
-           [
-           0 => 'remove',
-           ],
-           'mappedBy' => NULL,
-           'inversedBy' => 'user',
-           'joinColumns' =>
-           [
-           0 =>
-           [
+            'fieldName' => 'address',
+            'targetEntity' => Address::class,
+            'cascade' =>
+            [
+            0 => 'remove',
+            ],
+            'mappedBy' => NULL,
+            'inversedBy' => 'user',
+            'joinColumns' =>
+            [
+            0 =>
+            [
             'name' => 'address_id',
             'referencedColumnName' => 'id',
             'onDelete' => 'CASCADE',
-           ],
-           ],
-           'orphanRemoval' => false,
+            ],
+            ],
+            'orphanRemoval' => false,
             ]
         );
         $metadata->mapOneToMany(
             [
-           'fieldName' => 'phonenumbers',
-           'targetEntity' => Phonenumber::class,
-           'cascade' =>
-           [
-           1 => 'persist',
-           ],
-           'mappedBy' => 'user',
-           'orphanRemoval' => true,
-           'orderBy' =>
-           [
-           'number' => 'ASC',
-           ],
+            'fieldName' => 'phonenumbers',
+            'targetEntity' => Phonenumber::class,
+            'cascade' =>
+            [
+            1 => 'persist',
+            ],
+            'mappedBy' => 'user',
+            'orphanRemoval' => true,
+            'orderBy' =>
+            [
+            'number' => 'ASC',
+            ],
             ]
         );
         $metadata->mapManyToMany(
             [
-           'fieldName' => 'groups',
-           'targetEntity' => Group::class,
-           'cascade' =>
-           [
-           0 => 'remove',
-           1 => 'persist',
-           2 => 'refresh',
-           3 => 'merge',
-           4 => 'detach',
-           ],
-           'mappedBy' => NULL,
-           'joinTable' =>
-           [
-           'name' => 'cms_users_groups',
-           'joinColumns' =>
-           [
+            'fieldName' => 'groups',
+            'targetEntity' => Group::class,
+            'cascade' =>
+            [
+            0 => 'remove',
+            1 => 'persist',
+            2 => 'refresh',
+            3 => 'merge',
+            4 => 'detach',
+            ],
+            'mappedBy' => NULL,
+            'joinTable' =>
+            [
+            'name' => 'cms_users_groups',
+            'joinColumns' =>
+            [
             0 =>
             [
             'name' => 'user_id',
@@ -1269,18 +1269,18 @@ 
             'unique' => false,
             'nullable' => false,
             ],
-           ],
-           'inverseJoinColumns' =>
-           [
+            ],
+            'inverseJoinColumns' =>
+            [
             0 =>
             [
             'name' => 'group_id',
             'referencedColumnName' => 'id',
             'columnDefinition' => 'INT NULL',
             ],
-           ],
-           ],
-           'orderBy' => NULL,
+            ],
+            ],
+            'orderBy' => NULL,
             ]
         );
         $metadata->table['uniqueConstraints'] = [
@@ -1391,9 +1391,9 @@ 
     {
         $metadata->mapField(
             [
-           'id'                 => true,
-           'fieldName'          => 'id',
-           'columnDefinition'   => 'INT unsigned NOT NULL',
+            'id'                 => true,
+            'fieldName'          => 'id',
+            'columnDefinition'   => 'INT unsigned NOT NULL',
             ]
         );
 
@@ -1422,16 +1422,16 @@ 
      * @Column(type="integer")
      * @GeneratedValue(strategy="NONE")
      **/
-   public $id;
+    public $id;
 
-   public static function loadMetadata(ClassMetadataInfo $metadata)
+    public static function loadMetadata(ClassMetadataInfo $metadata)
     {
-         $metadata->mapField(
-             [
-           'id'                 => true,
-           'fieldName'          => 'id',
-             ]
-         );
+            $metadata->mapField(
+                [
+            'id'                 => true,
+            'fieldName'          => 'id',
+                ]
+            );
 
         $metadata->setDiscriminatorColumn(
             [

Spacing +46 added lines, -46 removed lines

@@ -605,13 +605,13 @@ 
 
         $findByIdQuery = $class->getNamedNativeQuery('find-by-id');
         self::assertEquals('find-by-id', $findByIdQuery['name']);
-        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('count', $countQuery['name']);
         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);
@@ -622,9 +622,9 @@ 
         $findAllMapping = $class->getSqlResultSetMapping('mapping-find-all');
         self::assertEquals('mapping-find-all', $findAllMapping['name']);
         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');
         self::assertEquals('mapping-without-fields', $withoutFieldsMapping['name']);
@@ -650,62 +650,62 @@ 
         self::assertCount(4, $userMetadata->getSqlResultSetMappings());
 
         $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($userMetadata->name,                                    $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($userMetadata->name, $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->name,                                            $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->name, $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->name,                        $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->name, $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($userMetadata->name,                            $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($userMetadata->name, $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());
 
         $mapping = $personMetadata->getSqlResultSetMapping('mappingFetchAll');
-        self::assertEquals([],$mapping['columns']);
+        self::assertEquals([], $mapping['columns']);
         self::assertEquals('mappingFetchAll', $mapping['name']);
-        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($personMetadata->name,                      $mapping['entities'][0]['entityClass']);
+        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($personMetadata->name, $mapping['entities'][0]['entityClass']);
     }
 
     /*
@@ -746,7 +746,7 @@ 
 
         self::assertEquals(['user_id'=>'id'], $guestGroups['relationToSourceKeyColumns']);
         self::assertEquals(['group_id'=>'id'], $guestGroups['relationToTargetKeyColumns']);
-        self::assertEquals(['user_id','group_id'], $guestGroups['joinTableColumns']);
+        self::assertEquals(['user_id', 'group_id'], $guestGroups['joinTableColumns']);
 
 
         self::assertEquals('ddc964_users_admingroups', $adminGroups['joinTable']['name']);
@@ -755,7 +755,7 @@ 
 
         self::assertEquals(['adminuser_id'=>'id'], $adminGroups['relationToSourceKeyColumns']);
         self::assertEquals(['admingroup_id'=>'id'], $adminGroups['relationToTargetKeyColumns']);
-        self::assertEquals(['adminuser_id','admingroup_id'], $adminGroups['joinTableColumns']);
+        self::assertEquals(['adminuser_id', 'admingroup_id'], $adminGroups['joinTableColumns']);
 
 
         // assert address association mappings
@@ -833,8 +833,8 @@ 
         self::assertTrue($adminMetadata->fieldMappings['id']['id']);
         self::assertEquals('id', $adminMetadata->fieldMappings['id']['fieldName']);
         self::assertEquals('user_id', $adminMetadata->fieldMappings['id']['columnName']);
-        self::assertEquals(['user_id'=>'id','user_name'=>'name'], $adminMetadata->fieldNames);
-        self::assertEquals(['id'=>'user_id','name'=>'user_name'], $adminMetadata->columnNames);
+        self::assertEquals(['user_id'=>'id', 'user_name'=>'name'], $adminMetadata->fieldNames);
+        self::assertEquals(['id'=>'user_id', 'name'=>'user_name'], $adminMetadata->columnNames);
         self::assertEquals(150, $adminMetadata->fieldMappings['id']['length']);
 
 
@@ -848,8 +848,8 @@ 
         self::assertTrue($guestMetadata->fieldMappings['id']['id']);
         self::assertEquals('guest_id', $guestMetadata->fieldMappings['id']['columnName']);
         self::assertEquals('id', $guestMetadata->fieldMappings['id']['fieldName']);
-        self::assertEquals(['guest_id'=>'id','guest_name'=>'name'], $guestMetadata->fieldNames);
-        self::assertEquals(['id'=>'guest_id','name'=>'guest_name'], $guestMetadata->columnNames);
+        self::assertEquals(['guest_id'=>'id', 'guest_name'=>'name'], $guestMetadata->fieldNames);
+        self::assertEquals(['id'=>'guest_id', 'name'=>'guest_name'], $guestMetadata->columnNames);
         self::assertEquals(140, $guestMetadata->fieldMappings['id']['length']);
 
         self::assertEquals('name', $guestMetadata->fieldMappings['name']['fieldName']);

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

Spacing +14 added lines, -14 removed lines

@@ -21,7 +21,7 @@ 
 use Doctrine\Tests\OrmTestCase;
 use DoctrineGlobal_Article;
 
-require_once __DIR__ . '/../../Models/Global/GlobalNamespaceModel.php';
+require_once __DIR__.'/../../Models/Global/GlobalNamespaceModel.php';
 
 class ClassMetadataTest extends OrmTestCase
 {
@@ -71,7 +71,7 @@ 
         self::assertEquals('phonenumbers', $oneOneMapping['fieldName']);
         self::assertEquals(CMS\CmsAddress::class, $oneOneMapping['targetEntity']);
         self::assertTrue($cm->isReadOnly);
-        self::assertEquals(['dql' => ['name'=>'dql','query'=>'foo','dql'=>'foo']], $cm->namedQueries);
+        self::assertEquals(['dql' => ['name'=>'dql', 'query'=>'foo', 'dql'=>'foo']], $cm->namedQueries);
     }
 
     public function testFieldIsNullable()
@@ -204,7 +204,7 @@ 
     {
         $cm = new ClassMetadata(CMS\CmsUser::class);
         $cm->initializeReflection(new RuntimeReflectionService());
-        $cm->isIdentifierComposite  = true;
+        $cm->isIdentifierComposite = true;
 
         $this->expectException(\Doctrine\ORM\Mapping\MappingException::class);
         $cm->getSingleIdentifierFieldName();
@@ -396,7 +396,7 @@ 
 
         self::assertEquals('CMS_ADDRESS_CMS_USER', $manyToManyMetadata->associationMappings['user']['joinTable']['name']);
 
-        self::assertEquals(['CMS_ADDRESS_ID','CMS_USER_ID'], $manyToManyMetadata->associationMappings['user']['joinTableColumns']);
+        self::assertEquals(['CMS_ADDRESS_ID', 'CMS_USER_ID'], $manyToManyMetadata->associationMappings['user']['joinTableColumns']);
         self::assertEquals(['CMS_ADDRESS_ID'=>'ID'], $manyToManyMetadata->associationMappings['user']['relationToSourceKeyColumns']);
         self::assertEquals(['CMS_USER_ID'=>'ID'], $manyToManyMetadata->associationMappings['user']['relationToTargetKeyColumns']);
 
@@ -436,7 +436,7 @@ 
         $cm->initializeReflection(new RuntimeReflectionService());
 
         $this->expectException(MappingException::class);
-        $this->expectExceptionMessage("No mapping found for field 'foo' on class '" . CMS\CmsUser::class . "'.");
+        $this->expectExceptionMessage("No mapping found for field 'foo' on class '".CMS\CmsUser::class."'.");
 
         $cm->getFieldMapping('foo');
     }
@@ -546,7 +546,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);
         $cm->initializeReflection(new RuntimeReflectionService());
@@ -701,12 +701,12 @@ 
         $mapping = $cm->getSqlResultSetMapping('find-all');
 
         self::assertEquals(CMS\CmsUser::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']);
     }
@@ -921,7 +921,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());
     }
@@ -936,7 +936,7 @@ 
         $cm->mapManyToOne(['fieldName' => 'address', 'targetEntity' => 'UnknownClass']);
 
         $this->expectException(MappingException::class);
-        $this->expectExceptionMessage("The target-entity Doctrine\\Tests\\Models\\CMS\\UnknownClass cannot be found in '" . CMS\CmsUser::class . "#address'.");
+        $this->expectExceptionMessage("The target-entity Doctrine\\Tests\\Models\\CMS\\UnknownClass cannot be found in '".CMS\CmsUser::class."#address'.");
 
         $cm->validateAssociations();
     }
@@ -1075,7 +1075,7 @@ 
         $cm->initializeReflection(new RuntimeReflectionService());
 
         $this->expectException(MappingException::class);
-        $this->expectExceptionMessage("You have specified invalid cascade options for " . CMS\CmsUser::class . "::\$address: 'invalid'; available options: 'remove', 'persist', 'refresh', 'merge', and 'detach'");
+        $this->expectExceptionMessage("You have specified invalid cascade options for ".CMS\CmsUser::class."::\$address: 'invalid'; available options: 'remove', 'persist', 'refresh', 'merge', and 'detach'");
 
         $cm->mapManyToOne(['fieldName' => 'address', 'targetEntity' => 'UnknownClass', 'cascade' => ['invalid']]);
      }
@@ -1320,7 +1320,7 @@ 
      */
     public function propertyToColumnName($propertyName, $className = null)
     {
-        return strtolower($this->classToTableName($className)) . '_' . $propertyName;
+        return strtolower($this->classToTableName($className)).'_'.$propertyName;
     }
 }
 

tests/Doctrine/Tests/ORM/Mapping/Reflection/ReflectionPropertiesGetterTest.php

Spacing +3 added lines, -3 removed lines

@@ -45,15 +45,15 @@
             ->getProperties(ClassWithMixedProperties::class);
 
         self::assertArrayHasKey(
-            "\0" . ClassWithMixedProperties::class . "\0" . 'privateProperty',
+            "\0".ClassWithMixedProperties::class."\0".'privateProperty',
             $properties
         );
         self::assertArrayHasKey(
-            "\0" . ClassWithMixedProperties::class . "\0" . 'privatePropertyOverride',
+            "\0".ClassWithMixedProperties::class."\0".'privatePropertyOverride',
             $properties
         );
         self::assertArrayHasKey(
-            "\0" . ParentClass::class . "\0" . 'privatePropertyOverride',
+            "\0".ParentClass::class."\0".'privatePropertyOverride',
             $properties
         );
         self::assertArrayHasKey(

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

Spacing +6 added lines, -6 removed lines

@@ -55,8 +55,8 @@ 
         $class->mapField(['fieldName' => 'name', 'columnName' => 'name']);
         $class->mapField(['fieldName' => 'id', 'columnName' => 'id', 'id' => true]);
 
-        self::assertEquals('id' ,$this->strategy->getColumnName('id', $class, $this->platform));
-        self::assertEquals('name' ,$this->strategy->getColumnName('name', $class, $this->platform));
+        self::assertEquals('id', $this->strategy->getColumnName('id', $class, $this->platform));
+        self::assertEquals('name', $this->strategy->getColumnName('name', $class, $this->platform));
     }
 
     public function testGetTableName()
@@ -64,7 +64,7 @@ 
         $class = $this->createClassMetadata(CmsUser::class);
 
         $class->setPrimaryTable(['name'=>'cms_user']);
-        self::assertEquals('cms_user' ,$this->strategy->getTableName($class, $this->platform));
+        self::assertEquals('cms_user', $this->strategy->getTableName($class, $this->platform));
     }
 
     public function testJoinTableName()
@@ -125,7 +125,7 @@ 
         );
 
         $joinColumn = $class->associationMappings['article']['joinColumns'][0];
-        self::assertEquals('article',$this->strategy->getJoinColumnName($joinColumn, $class, $this->platform));
+        self::assertEquals('article', $this->strategy->getJoinColumnName($joinColumn, $class, $this->platform));
     }
 
     public function testReferencedJoinColumnName()
@@ -146,7 +146,7 @@ 
         );
 
         $joinColumn = $cm->associationMappings['article']['joinColumns'][0];
-        self::assertEquals('id',$this->strategy->getReferencedJoinColumnName($joinColumn, $cm, $this->platform));
+        self::assertEquals('id', $this->strategy->getReferencedJoinColumnName($joinColumn, $cm, $this->platform));
     }
 
     public function testGetSequenceName()
@@ -160,6 +160,6 @@ 
 
         $class->setSequenceGeneratorDefinition($definition);
 
-        self::assertEquals('user_id_seq',$this->strategy->getSequenceName($definition, $class, $this->platform));
+        self::assertEquals('user_id_seq', $this->strategy->getSequenceName($definition, $class, $this->platform));
     }
 }