doctrine / orm

lib/Doctrine/ORM/Utility/PersisterHelper.php

Spacing +3 added lines, -3 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\ORM\Utility;
 
@@ -62,14 +62,14 @@ 
 
         // iterate over association mappings
         foreach ($class->getDeclaredPropertiesIterator() as $association) {
-            if (! ($association instanceof AssociationMetadata)) {
+            if ( ! ($association instanceof AssociationMetadata)) {
                 continue;
             }
 
             // resolve join columns over to-one or to-many
             $targetClass = $em->getClassMetadata($association->getTargetEntity());
 
-            if (! $association->isOwningSide()) {
+            if ( ! $association->isOwningSide()) {
                 $association = $targetClass->getProperty($association->getMappedBy());
                 $targetClass = $em->getClassMetadata($association->getTargetEntity());
             }

tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php

Spacing +40 added lines, -40 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Tools;
 
@@ -39,7 +39,7 @@ 
         $this->namespace = uniqid("doctrine_", false);
         $this->tmpDir = sys_get_temp_dir();
 
-        mkdir($this->tmpDir . \DIRECTORY_SEPARATOR . $this->namespace);
+        mkdir($this->tmpDir.\DIRECTORY_SEPARATOR.$this->namespace);
 
         $this->generator = new EntityGenerator();
 
@@ -52,7 +52,7 @@ 
 
     public function tearDown()
     {
-        $ri = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($this->tmpDir . '/' . $this->namespace));
+        $ri = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($this->tmpDir.'/'.$this->namespace));
 
         foreach ($ri AS $file) {
             /* @var $file \SplFileInfo */
@@ -61,7 +61,7 @@ 
             }
         }
 
-        rmdir($this->tmpDir . '/' . $this->namespace);
+        rmdir($this->tmpDir.'/'.$this->namespace);
     }
 
     /**
@@ -71,9 +71,9 @@ 
      */
     public function generateBookEntityFixture(array $embeddedClasses = [])
     {
-        $metadata = new ClassMetadata($this->namespace . '\EntityGeneratorBook', $this->metadataBuildingContext);
+        $metadata = new ClassMetadata($this->namespace.'\EntityGeneratorBook', $this->metadataBuildingContext);
 
-        $metadata->setCustomRepositoryClassName($this->namespace . '\EntityGeneratorBookRepository');
+        $metadata->setCustomRepositoryClassName($this->namespace.'\EntityGeneratorBookRepository');
 
         $tableMetadata = new Mapping\TableMetadata();
 
@@ -192,7 +192,7 @@ 
 
     private function generateEntityTypeFixture(array $field)
     {
-        $metadata = new ClassMetadata($this->namespace . '\EntityType', $this->metadataBuildingContext);
+        $metadata = new ClassMetadata($this->namespace.'\EntityType', $this->metadataBuildingContext);
 
         $tableMetadata = new Mapping\TableMetadata();
         $tableMetadata->setName('entity_type');
@@ -225,7 +225,7 @@ 
      */
     private function generateIsbnEmbeddableFixture(array $embeddedClasses = [], $columnPrefix = null)
     {
-        $metadata = new ClassMetadata($this->namespace . '\EntityGeneratorIsbn', $this->metadataBuildingContext);
+        $metadata = new ClassMetadata($this->namespace.'\EntityGeneratorIsbn', $this->metadataBuildingContext);
         $metadata->isEmbeddedClass = true;
 
         $fieldMetadata = new Mapping\FieldMetadata('prefix');
@@ -283,7 +283,7 @@ 
      */
     private function generateTestEmbeddableFixture()
     {
-        $metadata = new ClassMetadata($this->namespace . '\EntityGeneratorTestEmbeddable', $this->metadataBuildingContext);
+        $metadata = new ClassMetadata($this->namespace.'\EntityGeneratorTestEmbeddable', $this->metadataBuildingContext);
 
         $metadata->isEmbeddedClass = true;
 
@@ -326,7 +326,7 @@ 
     private function loadEntityClass(ClassMetadata $metadata)
     {
         $className = basename(str_replace('\\', '/', $metadata->getClassName()));
-        $path      = $this->tmpDir . '/' . $this->namespace . '/' . $className . '.php';
+        $path      = $this->tmpDir.'/'.$this->namespace.'/'.$className.'.php';
 
         self::assertFileExists($path);
 
@@ -477,7 +477,7 @@ 
 
         $this->generator->writeEntityClass($metadata, $this->tmpDir);
 
-        self::assertFileExists($this->tmpDir . "/" . $this->namespace . "/EntityGeneratorBook.php~");
+        self::assertFileExists($this->tmpDir."/".$this->namespace."/EntityGeneratorBook.php~");
 
         $book = $this->newInstance($metadata);
         $reflClass = new \ReflectionClass($metadata->getClassName());
@@ -629,7 +629,7 @@ 
      */
     public function testMappedSuperclassAnnotationGeneration()
     {
-        $metadata = new ClassMetadata($this->namespace . '\EntityGeneratorBook', $this->metadataBuildingContext);
+        $metadata = new ClassMetadata($this->namespace.'\EntityGeneratorBook', $this->metadataBuildingContext);
 
         $metadata->isMappedSuperclass = true;
 
@@ -667,7 +667,7 @@ 
      */
     public function testGenerateEntityWithSequenceGenerator()
     {
-        $metadata = new ClassMetadata($this->namespace . '\DDC1784Entity', $this->metadataBuildingContext);
+        $metadata = new ClassMetadata($this->namespace.'\DDC1784Entity', $this->metadataBuildingContext);
 
         $fieldMetadata = new Mapping\FieldMetadata('id');
         $fieldMetadata->setType(Type::getType('integer'));
@@ -684,8 +684,8 @@ 
 
         $this->generator->writeEntityClass($metadata, $this->tmpDir);
 
-        $filename = $this->tmpDir . DIRECTORY_SEPARATOR
-                  . $this->namespace . DIRECTORY_SEPARATOR . 'DDC1784Entity.php';
+        $filename = $this->tmpDir.DIRECTORY_SEPARATOR
+                  . $this->namespace.DIRECTORY_SEPARATOR.'DDC1784Entity.php';
 
         self::assertFileExists($filename);
 
@@ -705,7 +705,7 @@ 
      */
     public function testGenerateEntityWithMultipleInverseJoinColumns()
     {
-        $metadata = new ClassMetadata($this->namespace . '\DDC2079Entity', $this->metadataBuildingContext);
+        $metadata = new ClassMetadata($this->namespace.'\DDC2079Entity', $this->metadataBuildingContext);
 
         $fieldMetadata = new Mapping\FieldMetadata('id');
         $fieldMetadata->setType(Type::getType('integer'));
@@ -744,14 +744,14 @@ 
         $association = new Mapping\ManyToManyAssociationMetadata('centroCustos');
 
         $association->setJoinTable($joinTable);
-        $association->setTargetEntity($this->namespace . '\\DDC2079CentroCusto');
+        $association->setTargetEntity($this->namespace.'\\DDC2079CentroCusto');
 
         $metadata->addProperty($association);
 
         $this->generator->writeEntityClass($metadata, $this->tmpDir);
 
-        $filename = $this->tmpDir . DIRECTORY_SEPARATOR
-            . $this->namespace . DIRECTORY_SEPARATOR . 'DDC2079Entity.php';
+        $filename = $this->tmpDir.DIRECTORY_SEPARATOR
+            . $this->namespace.DIRECTORY_SEPARATOR.'DDC2079Entity.php';
 
         self::assertFileExists($filename);
 
@@ -782,7 +782,7 @@ 
         $method->setAccessible(true);
 
         foreach ($constants as $name => $value) {
-            if( ! preg_match($pattern, $name)) {
+            if ( ! preg_match($pattern, $name)) {
                 continue;
             }
 
@@ -811,7 +811,7 @@ 
         $method->setAccessible(true);
 
         foreach ($constants as $name => $value) {
-            if( ! preg_match($pattern, $name)) {
+            if ( ! preg_match($pattern, $name)) {
                 continue;
             }
 
@@ -840,7 +840,7 @@ 
         $method->setAccessible(true);
 
         foreach ($constants as $name => $value) {
-            if( ! preg_match($pattern, $name)) {
+            if ( ! preg_match($pattern, $name)) {
                 continue;
             }
 
@@ -864,7 +864,7 @@ 
     public function testEntityTypeAlias(array $field)
     {
         $metadata   = $this->generateEntityTypeFixture($field);
-        $path       = $this->tmpDir . '/'. $this->namespace . '/EntityType.php';
+        $path       = $this->tmpDir.'/'.$this->namespace.'/EntityType.php';
 
         self::assertFileExists($path);
         require_once $path;
@@ -877,8 +877,8 @@ 
         $type   = $field['phpType'];
         $name   = $field['fieldName'];
         $value  = $field['value'];
-        $getter = "get" . ucfirst($name);
-        $setter = "set" . ucfirst($name);
+        $getter = "get".ucfirst($name);
+        $setter = "set".ucfirst($name);
 
         self::assertPhpDocVarType($type, $reflClass->getProperty($name));
         self::assertPhpDocParamType($type, $reflClass->getMethod($setter));
@@ -901,13 +901,13 @@ 
         $metadata = $cmf->getMetadataFor(get_class($user));
 
         // @todo guilhermeblanco Fix this test as changing Entity class should never be allowed.
-        $metadata->setClassName($this->namespace . "\DDC2372User");
+        $metadata->setClassName($this->namespace."\DDC2372User");
 
         $this->generator->writeEntityClass($metadata, $this->tmpDir);
 
-        self::assertFileExists($this->tmpDir . "/" . $this->namespace . "/DDC2372User.php");
+        self::assertFileExists($this->tmpDir."/".$this->namespace."/DDC2372User.php");
 
-        require $this->tmpDir . "/" . $this->namespace . "/DDC2372User.php";
+        require $this->tmpDir."/".$this->namespace."/DDC2372User.php";
 
         $reflClass = new \ReflectionClass($metadata->getClassName());
 
@@ -929,12 +929,12 @@ 
         $metadata = $cmf->getMetadataFor(get_class($user));
 
         // @todo guilhermeblanco Fix this test as changing Entity class should never be allowed.
-        $metadata->setClassName($this->namespace . "\DDC2372Admin");
+        $metadata->setClassName($this->namespace."\DDC2372Admin");
 
         $this->generator->writeEntityClass($metadata, $this->tmpDir);
 
-        self::assertFileExists($this->tmpDir . "/" . $this->namespace . "/DDC2372Admin.php");
-        require $this->tmpDir . "/" . $this->namespace . "/DDC2372Admin.php";
+        self::assertFileExists($this->tmpDir."/".$this->namespace."/DDC2372Admin.php");
+        require $this->tmpDir."/".$this->namespace."/DDC2372Admin.php";
 
         $reflClass = new \ReflectionClass($metadata->getClassName());
 
@@ -954,22 +954,22 @@ 
         $cmf->setEntityManager($em);
 
         $ns     = $this->namespace;
-        $nsdir  = $this->tmpDir . '/' . $ns;
+        $nsdir  = $this->tmpDir.'/'.$ns;
 
         // Dump DDC1590User into temp file
         $content = str_replace(
             'namespace Doctrine\Tests\Models\DDC1590',
-            'namespace ' . $ns,
-            file_get_contents(__DIR__ . '/../../Models/DDC1590/DDC1590User.php')
+            'namespace '.$ns,
+            file_get_contents(__DIR__.'/../../Models/DDC1590/DDC1590User.php')
         );
 
-        $fname = $nsdir . "/DDC1590User.php";
+        $fname = $nsdir."/DDC1590User.php";
         file_put_contents($fname, $content);
 
         // Require DDC1590User
         require $fname;
 
-        $metadata = $cmf->getMetadataFor($ns . '\DDC1590User');
+        $metadata = $cmf->getMetadataFor($ns.'\DDC1590User');
         $this->generator->writeEntityClass($metadata, $this->tmpDir);
 
         // class DDC1590User extends DDC1590Entity { ... }
@@ -977,13 +977,13 @@ 
 
         // class _DDC1590User extends DDC1590Entity { ... }
         $source2    = str_replace('class DDC1590User', 'class _DDC1590User', $source);
-        $fname2     = $nsdir . "/_DDC1590User.php";
+        $fname2     = $nsdir."/_DDC1590User.php";
         file_put_contents($fname2, $source2);
         require $fname2;
 
         // class __DDC1590User { ... }
         $source3    = str_replace('class DDC1590User extends DDC1590Entity', 'class __DDC1590User', $source);
-        $fname3     = $nsdir . "/__DDC1590User.php";
+        $fname3     = $nsdir."/__DDC1590User.php";
         file_put_contents($fname3, $source3);
         require $fname3;
 
@@ -1146,7 +1146,7 @@ 
         $this->loadEntityClass($metadata);
 
         $className = basename(str_replace('\\', '/', $metadata->getClassName()));
-        $path = $this->tmpDir . '/' . $this->namespace . '/' . $className . '.php';
+        $path = $this->tmpDir.'/'.$this->namespace.'/'.$className.'.php';
         $classTest = file_get_contents($path);
 
         $this->generator->setRegenerateEntityIfExists(true);
@@ -1155,7 +1155,7 @@ 
         $this->generator->writeEntityClass($metadata, $this->tmpDir);
         $classNew = file_get_contents($path);
 
-        self::assertSame($classTest,$classNew);
+        self::assertSame($classTest, $classNew);
     }
 
     /**

tests/Doctrine/Tests/ORM/Hydration/ResultSetMappingTest.php

Indentation +2 added lines, -2 removed lines

@@ -203,8 +203,8 @@
     }
 
         /**
-     * @group DDC-1663
-     */
+         * @group DDC-1663
+         */
     public function testAddNamedNativeQueryResultSetMappingWithoutFields()
     {
         $cm = new ClassMetadata(CmsUser::class, $this->metadataBuildingContext);

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

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-declare(strict_types=1);
+declare(strict_types = 1);
 
 namespace Doctrine\Tests\ORM\Functional;
 
@@ -53,7 +53,7 @@ 
         $driver = new DatabaseDriver($sm);
 
         foreach ($driver->getAllClassNames() as $className) {
-            if (!in_array(strtolower($className), $classNames)) {
+            if ( ! in_array(strtolower($className), $classNames)) {
                 continue;
             }
 
@@ -65,7 +65,7 @@ 
         }
 
         if (count($metadatas) != count($classNames)) {
-            $this->fail("Have not found all classes matching the names '" . implode(", ", $classNames) . "' only tables " . implode(", ", array_keys($metadatas)));
+            $this->fail("Have not found all classes matching the names '".implode(", ", $classNames)."' only tables ".implode(", ", array_keys($metadatas)));
         }
         return $metadatas;
     }

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

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;
 
@@ -30,7 +30,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
 {
@@ -637,7 +637,7 @@ 
             $namingStrategy
         );
 
-        $metadata       = new ClassMetadata(CMS\CmsAddress::class, $this->metadataBuildingContext);
+        $metadata = new ClassMetadata(CMS\CmsAddress::class, $this->metadataBuildingContext);
 
         $association = new Mapping\ManyToManyAssociationMetadata('user');
 
@@ -797,7 +797,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."'.");
 
         $metadata = new ClassMetadata(CMS\CmsUser::class, $this->metadataBuildingContext);
         $metadata->initializeReflection(new RuntimeReflectionService());
@@ -943,12 +943,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']);
     }
@@ -1146,7 +1146,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());
     }
@@ -1166,7 +1166,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();
     }
@@ -1504,6 +1504,6 @@ 
      */
     public function propertyToColumnName($propertyName, $className = null)
     {
-        return strtolower($this->classToTableName($className)) . '_' . $propertyName;
+        return strtolower($this->classToTableName($className)).'_'.$propertyName;
     }
 }