doctrine / orm

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

Spacing +8 added lines, -8 removed lines

@@ -49,13 +49,13 @@ 
     {
         parent::setUp();
 
-        if (! Type::hasType(GH7820LineTextType::class)) {
+        if ( ! Type::hasType(GH7820LineTextType::class)) {
             Type::addType(GH7820LineTextType::class, GH7820LineTextType::class);
         }
 
         $this->setUpEntitySchema([GH7820Line::class]);
 
-        $this->_em->createQuery('DELETE FROM ' . GH7820Line::class . ' l')
+        $this->_em->createQuery('DELETE FROM '.GH7820Line::class.' l')
             ->execute();
 
         foreach (self::SONG as $index => $line) {
@@ -73,7 +73,7 @@ 
 
         self::assertSame(
             self::SONG,
-            array_map(static function (GH7820Line $line) : string {
+            array_map(static function(GH7820Line $line) : string {
                 return $line->toString();
             }, iterator_to_array(new Paginator($query)))
         );
@@ -95,7 +95,7 @@ 
 
         self::assertSame(
             self::SONG,
-            array_map(static function (GH7820Line $line) : string {
+            array_map(static function(GH7820Line $line) : string {
                 return $line->toString();
             }, iterator_to_array(new Paginator($query))),
             'Expected to return expected data before query cache is populated with DQL -> SQL translation. Were SQL parameters translated?'
@@ -107,7 +107,7 @@ 
 
         self::assertSame(
             self::SONG,
-            array_map(static function (GH7820Line $line) : string {
+            array_map(static function(GH7820Line $line) : string {
                 return $line->toString();
             }, iterator_to_array(new Paginator($query))),
             'Expected to return expected data even when DQL -> SQL translation is present in cache. Were SQL parameters translated again?'
@@ -165,7 +165,7 @@ 
 
     public function __toString() : string
     {
-        return 'Line: ' . $this->text;
+        return 'Line: '.$this->text;
     }
 }
 
@@ -175,7 +175,7 @@ 
     {
         $text = parent::convertToPHPValue($value, $platform);
 
-        if (! is_string($text)) {
+        if ( ! is_string($text)) {
             return $text;
         }
 
@@ -184,7 +184,7 @@ 
 
     public function convertToDatabaseValue($value, AbstractPlatform $platform)
     {
-        if (! $value instanceof GH7820LineText) {
+        if ( ! $value instanceof GH7820LineText) {
             return parent::convertToDatabaseValue($value, $platform);
         }
 

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

Spacing +13 added lines, -13 removed lines

@@ -44,7 +44,7 @@ 
     {
         $driverMock = new DriverMock();
         $config = new Configuration();
-        $config->setProxyDir(__DIR__ . '/../../Proxies');
+        $config->setProxyDir(__DIR__.'/../../Proxies');
         $config->setProxyNamespace('Doctrine\Tests\Proxies');
         $eventManager = new EventManager();
         $conn = new ConnectionMock([], $driverMock, $config, $eventManager);
@@ -62,7 +62,7 @@ 
             'yaml'       => YamlDriver::class,
         ];
 
-        $this->assertArrayHasKey($type, $mappingDriver, "There is no metadata driver for the type '" . $type . "'.");
+        $this->assertArrayHasKey($type, $mappingDriver, "There is no metadata driver for the type '".$type."'.");
 
         $class  = $mappingDriver[$type];
         $driver = ($type === 'annotation')
@@ -85,10 +85,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();
@@ -99,7 +99,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();
@@ -114,9 +114,9 @@ 
         $exporter->export();
 
         if ($type == 'annotation') {
-            $this->assertTrue(file_exists(__DIR__ . '/export/' . $type . '/'.str_replace('\\', '/', ExportedUser::class).$this->_extension));
+            $this->assertTrue(file_exists(__DIR__.'/export/'.$type.'/'.str_replace('\\', '/', ExportedUser::class).$this->_extension));
         } else {
-            $this->assertTrue(file_exists(__DIR__ . '/export/' . $type . '/Doctrine.Tests.ORM.Tools.Export.ExportedUser'.$this->_extension));
+            $this->assertTrue(file_exists(__DIR__.'/export/'.$type.'/Doctrine.Tests.ORM.Tools.Export.ExportedUser'.$this->_extension));
         }
 
         $this->assertHasDeprecationMessages();
@@ -129,7 +129,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();
@@ -215,7 +215,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']");
@@ -359,7 +359,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:*");
@@ -368,7 +368,7 @@ 
             $this->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'));
 
             $this->assertTrue(isset($value[ExportedUser::class]['oneToMany']['interests']['cascade']));
             $this->assertEquals(1, count($value[ExportedUser::class]['oneToMany']['interests']['cascade']));
@@ -408,10 +408,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/Functional/Ticket/DDC1383Test.php

Indentation +47 added lines, -47 removed lines

@@ -27,30 +27,30 @@ 
 
     public function testFailingCase()
     {
-		$parent = new DDC1383Entity();
-		$child = new DDC1383Entity();
+        $parent = new DDC1383Entity();
+        $child = new DDC1383Entity();
 
-		$child->setReference($parent);
+        $child->setReference($parent);
 
-		$this->_em->persist($parent);
-		$this->_em->persist($child);
+        $this->_em->persist($parent);
+        $this->_em->persist($child);
 
-		$id = $child->getId();
+        $id = $child->getId();
 
-		$this->_em->flush();
-		$this->_em->clear();
+        $this->_em->flush();
+        $this->_em->clear();
 
-		// Try merging the parent entity
-		$child = $this->_em->merge($child);
-		$parent = $child->getReference();
+        // Try merging the parent entity
+        $child = $this->_em->merge($child);
+        $parent = $child->getReference();
 
-		// Parent is not instance of the abstract class
-		self::assertTrue($parent instanceof DDC1383AbstractEntity,
-				"Entity class is " . get_class($parent) . ', "DDC1383AbstractEntity" was expected');
+        // Parent is not instance of the abstract class
+        self::assertTrue($parent instanceof DDC1383AbstractEntity,
+                "Entity class is " . get_class($parent) . ', "DDC1383AbstractEntity" was expected');
 
-		// Parent is NOT instance of entity
-		self::assertTrue($parent instanceof DDC1383Entity,
-				"Entity class is " . get_class($parent) . ', "DDC1383Entity" was expected');
+        // Parent is NOT instance of entity
+        self::assertTrue($parent instanceof DDC1383Entity,
+                "Entity class is " . get_class($parent) . ', "DDC1383Entity" was expected');
         $this->assertHasDeprecationMessages();
     }
 }
@@ -63,22 +63,22 @@ 
  */
 abstract class DDC1383AbstractEntity
 {
-	/**
-	 * @Id
-	 * @Column(type="integer")
-	 * @GeneratedValue
-	 */
-	protected $id;
-
-	public function getId()
-	{
-		return $this->id;
-	}
-
-	public function setId($id)
-	{
-		$this->id = $id;
-	}
+    /**
+     * @Id
+     * @Column(type="integer")
+     * @GeneratedValue
+     */
+    protected $id;
+
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    public function setId($id)
+    {
+        $this->id = $id;
+    }
 }
 
 /**
@@ -86,18 +86,18 @@ 
  */
 class DDC1383Entity extends DDC1383AbstractEntity
 {
-	/**
-	 * @ManyToOne(targetEntity="DDC1383AbstractEntity")
-	 */
-	protected $reference;
-
-	public function getReference()
-	{
-		return $this->reference;
-	}
-
-	public function setReference(DDC1383AbstractEntity $reference)
-	{
-		$this->reference = $reference;
-	}
+    /**
+     * @ManyToOne(targetEntity="DDC1383AbstractEntity")
+     */
+    protected $reference;
+
+    public function getReference()
+    {
+        return $this->reference;
+    }
+
+    public function setReference(DDC1383AbstractEntity $reference)
+    {
+        $this->reference = $reference;
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -22,7 +22,7 @@ 
                 $this->_em->getClassMetadata(DDC1383Entity::class),
                 ]
             );
-        } catch(\Exception $ignored) {}
+        } catch (\Exception $ignored) {}
     }
 
     public function testFailingCase()
@@ -46,11 +46,11 @@ 
 
 		// Parent is not instance of the abstract class
 		self::assertTrue($parent instanceof DDC1383AbstractEntity,
-				"Entity class is " . get_class($parent) . ', "DDC1383AbstractEntity" was expected');
+				"Entity class is ".get_class($parent).', "DDC1383AbstractEntity" was expected');
 
 		// Parent is NOT instance of entity
 		self::assertTrue($parent instanceof DDC1383Entity,
-				"Entity class is " . get_class($parent) . ', "DDC1383Entity" was expected');
+				"Entity class is ".get_class($parent).', "DDC1383Entity" was expected');
         $this->assertHasDeprecationMessages();
     }
 }

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

Spacing +3 added lines, -3 removed lines

@@ -17,11 +17,11 @@ 
 
     protected function _loadDriver()
     {
-        if (!class_exists(Yaml::class, true)) {
+        if ( ! class_exists(Yaml::class, true)) {
             $this->markTestSkipped('Please install Symfony YAML Component into the include path of your PHP installation.');
         }
 
-        return new YamlDriver(__DIR__ . DIRECTORY_SEPARATOR . 'yaml');
+        return new YamlDriver(__DIR__.DIRECTORY_SEPARATOR.'yaml');
     }
 
     /**
@@ -32,7 +32,7 @@ 
     public function testJoinTablesWithMappedSuperclassForYamlDriver()
     {
         $yamlDriver = $this->_loadDriver();
-        $yamlDriver->getLocator()->addPaths([__DIR__ . DIRECTORY_SEPARATOR . 'yaml']);
+        $yamlDriver->getLocator()->addPaths([__DIR__.DIRECTORY_SEPARATOR.'yaml']);
 
         $em = $this->_getTestEntityManager();
         $em->getConfiguration()->setMetadataDriverImpl($yamlDriver);

lib/Doctrine/ORM/PersistentCollection.php

Spacing +3 added lines, -3 removed lines

@@ -400,7 +400,7 @@ 
      */
     public function containsKey($key)
     {
-        if (! $this->initialized && $this->association['fetch'] === ClassMetadata::FETCH_EXTRA_LAZY
+        if ( ! $this->initialized && $this->association['fetch'] === ClassMetadata::FETCH_EXTRA_LAZY
             && isset($this->association['indexBy'])) {
             $persister = $this->em->getUnitOfWork()->getCollectionPersister($this->association);
 
@@ -433,7 +433,7 @@ 
             && $this->association['fetch'] === ClassMetadata::FETCH_EXTRA_LAZY
             && isset($this->association['indexBy'])
         ) {
-            if (!$this->typeClass->isIdentifierComposite && $this->typeClass->isIdentifier($this->association['indexBy'])) {
+            if ( ! $this->typeClass->isIdentifierComposite && $this->typeClass->isIdentifier($this->association['indexBy'])) {
                 return $this->em->find($this->typeClass->name, $key);
             }
 
@@ -448,7 +448,7 @@ 
      */
     public function count()
     {
-        if (! $this->initialized && $this->association !== null && $this->association['fetch'] === ClassMetadata::FETCH_EXTRA_LAZY) {
+        if ( ! $this->initialized && $this->association !== null && $this->association['fetch'] === ClassMetadata::FETCH_EXTRA_LAZY) {
             $persister = $this->em->getUnitOfWork()->getCollectionPersister($this->association);
 
             return $persister->count($this) + ($this->isDirty ? $this->collection->count() : 0);

lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php

Spacing +4 added lines, -4 removed lines

@@ -317,7 +317,7 @@ 
                         : $value;
 
                     if ($cacheKeyInfo['isIdentifier'] && $value !== null) {
-                        $id[$dqlAlias] .= '|' . $value;
+                        $id[$dqlAlias] .= '|'.$value;
                         $nonemptyComponents[$dqlAlias] = true;
                     }
                     break;
@@ -352,11 +352,11 @@ 
 
             // WARNING: BC break! We know this is the desired behavior to type convert values, but this
             // erroneous behavior exists since 2.0 and we're forced to keep compatibility.
-            if (! isset($cacheKeyInfo['isScalar'])) {
+            if ( ! isset($cacheKeyInfo['isScalar'])) {
                 $type  = $cacheKeyInfo['type'];
                 $value = $type ? $type->convertToPHPValue($value, $this->_platform) : $value;
 
-                $fieldName = $cacheKeyInfo['dqlAlias'] . '_' . $fieldName;
+                $fieldName = $cacheKeyInfo['dqlAlias'].'_'.$fieldName;
             }
 
             $rowData[$fieldName] = $value;
@@ -465,7 +465,7 @@ 
     private function getDiscriminatorValues(ClassMetadata $classMetadata) : array
     {
         $values = array_map(
-            function (string $subClass) : string {
+            function(string $subClass) : string {
                 return (string) $this->getClassMetadata($subClass)->discriminatorValue;
             },
             $classMetadata->subClasses

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

Spacing +2 added lines, -2 removed lines

@@ -69,11 +69,11 @@
     private function getTableFullName(array $table) : string
     {
         $join = '.';
-        if (! $this->platform->supportsSchemas() && $this->platform->canEmulateSchemas()) {
+        if ( ! $this->platform->supportsSchemas() && $this->platform->canEmulateSchemas()) {
             $join = '__';
         }
 
-        return $table['schema'] . $join . $table['name'];
+        return $table['schema'].$join.$table['name'];
     }
 
     private function createClassMetadata(string $className) : ClassMetadata

lib/Doctrine/ORM/Tools/Export/ClassMetadataExporter.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 
     public function __construct()
     {
-        @trigger_error(self::class . ' is deprecated and will be removed in Doctrine ORM 3.0', E_USER_DEPRECATED);
+        @trigger_error(self::class.' is deprecated and will be removed in Doctrine ORM 3.0', E_USER_DEPRECATED);
     }
 
     /**

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

Spacing +3 added lines, -3 removed lines

@@ -60,7 +60,7 @@ 
      */
     public function __construct($dir = null)
     {
-        @trigger_error(static::class . ' is deprecated and will be removed in Doctrine ORM 3.0', E_USER_DEPRECATED);
+        @trigger_error(static::class.' is deprecated and will be removed in Doctrine ORM 3.0', E_USER_DEPRECATED);
 
         $this->_outputDir = $dir;
     }
@@ -146,7 +146,7 @@ 
                 if ( ! is_dir($dir)) {
                     mkdir($dir, 0775, true);
                 }
-                if (file_exists($path) && !$this->_overwriteExistingFiles) {
+                if (file_exists($path) && ! $this->_overwriteExistingFiles) {
                     throw ExportException::attemptOverwriteExistingFile($path);
                 }
                 file_put_contents($path, $output);
@@ -164,7 +164,7 @@ 
      */
     protected function _generateOutputPath(ClassMetadataInfo $metadata)
     {
-        return $this->_outputDir . '/' . str_replace('\\', '.', $metadata->name) . $this->_extension;
+        return $this->_outputDir.'/'.str_replace('\\', '.', $metadata->name).$this->_extension;
     }
 
     /**