Completed
Pull Request — 2.8.x (#8130)
by Gabriel
07:41
created
lib/Doctrine/ORM/Query/Parser.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -487,7 +487,7 @@  discard block
 block discarded – undo
487 487
         $tokenStr = substr($dql, $token['position'], $length);
488 488
 
489 489
         // Building informative message
490
-        $message = 'line 0, col ' . $tokenPos . " near '" . $tokenStr . "': Error: " . $message;
490
+        $message = 'line 0, col '.$tokenPos." near '".$tokenStr."': Error: ".$message;
491 491
 
492 492
         throw QueryException::semanticalError($message, QueryException::dqlError($this->query->getDQL()));
493 493
     }
@@ -634,7 +634,7 @@  discard block
 block discarded – undo
634 634
             // If the namespace is not given then assumes the first FROM entity namespace
635 635
             if (strpos($className, '\\') === false && ! class_exists($className) && strpos($fromClassName, '\\') !== false) {
636 636
                 $namespace  = substr($fromClassName, 0, strrpos($fromClassName, '\\'));
637
-                $fqcn       = $namespace . '\\' . $className;
637
+                $fqcn       = $namespace.'\\'.$className;
638 638
 
639 639
                 if (class_exists($fqcn)) {
640 640
                     $expression->className  = $fqcn;
@@ -686,13 +686,13 @@  discard block
 block discarded – undo
686 686
                 }
687 687
 
688 688
                 $this->semanticalError(
689
-                    "There is no mapped field named '$field' on class " . $class->name . ".", $deferredItem['token']
689
+                    "There is no mapped field named '$field' on class ".$class->name.".", $deferredItem['token']
690 690
                 );
691 691
             }
692 692
 
693 693
             if (array_intersect($class->identifier, $expr->partialFieldSet) != $class->identifier) {
694 694
                 $this->semanticalError(
695
-                    "The partial field selection of class " . $class->name . " must contain the identifier.",
695
+                    "The partial field selection of class ".$class->name." must contain the identifier.",
696 696
                     $deferredItem['token']
697 697
                 );
698 698
             }
@@ -761,7 +761,7 @@  discard block
 block discarded – undo
761 761
             // Check if field or association exists
762 762
             if ( ! isset($class->associationMappings[$field]) && ! isset($class->fieldMappings[$field])) {
763 763
                 $this->semanticalError(
764
-                    'Class ' . $class->name . ' has no field or association named ' . $field,
764
+                    'Class '.$class->name.' has no field or association named '.$field,
765 765
                     $deferredItem['token']
766 766
                 );
767 767
             }
@@ -801,8 +801,8 @@  discard block
 block discarded – undo
801 801
                 // Build the error message
802 802
                 $semanticalError  = 'Invalid PathExpression. ';
803 803
                 $semanticalError .= (count($expectedStringTypes) == 1)
804
-                    ? 'Must be a ' . $expectedStringTypes[0] . '.'
805
-                    : implode(' or ', $expectedStringTypes) . ' expected.';
804
+                    ? 'Must be a '.$expectedStringTypes[0].'.'
805
+                    : implode(' or ', $expectedStringTypes).' expected.';
806 806
 
807 807
                 $this->semanticalError($semanticalError, $deferredItem['token']);
808 808
             }
@@ -976,7 +976,7 @@  discard block
 block discarded – undo
976 976
 
977 977
         [$namespaceAlias, $simpleClassName] = explode(':', $this->lexer->token['value']);
978 978
 
979
-        return $this->em->getConfiguration()->getEntityNamespace($namespaceAlias) . '\\' . $simpleClassName;
979
+        return $this->em->getConfiguration()->getEntityNamespace($namespaceAlias).'\\'.$simpleClassName;
980 980
     }
981 981
 
982 982
     /**
@@ -988,7 +988,7 @@  discard block
 block discarded – undo
988 988
      */
989 989
     private function validateAbstractSchemaName($schemaName)
990 990
     {
991
-        if (! (class_exists($schemaName, true) || interface_exists($schemaName, true))) {
991
+        if ( ! (class_exists($schemaName, true) || interface_exists($schemaName, true))) {
992 992
             $this->semanticalError("Class '$schemaName' is not defined.", $this->lexer->token);
993 993
         }
994 994
     }
@@ -1044,7 +1044,7 @@  discard block
 block discarded – undo
1044 1044
 
1045 1045
         if ( ! isset($this->queryComponents[$identVariable])) {
1046 1046
             $this->semanticalError(
1047
-                'Identification Variable ' . $identVariable .' used in join path expression but was not defined before.'
1047
+                'Identification Variable '.$identVariable.' used in join path expression but was not defined before.'
1048 1048
             );
1049 1049
         }
1050 1050
 
@@ -1058,7 +1058,7 @@  discard block
 block discarded – undo
1058 1058
         $class = $qComp['metadata'];
1059 1059
 
1060 1060
         if ( ! $class->hasAssociation($field)) {
1061
-            $this->semanticalError('Class ' . $class->name . ' has no association named ' . $field);
1061
+            $this->semanticalError('Class '.$class->name.' has no association named '.$field);
1062 1062
         }
1063 1063
 
1064 1064
         return new AST\JoinAssociationPathExpression($identVariable, $field);
@@ -2587,7 +2587,7 @@  discard block
 block discarded – undo
2587 2587
             return $this->NullComparisonExpression();
2588 2588
         }
2589 2589
 
2590
-        if ($token['type'] === Lexer::T_IS  && $lookahead['type'] === Lexer::T_EMPTY) {
2590
+        if ($token['type'] === Lexer::T_IS && $lookahead['type'] === Lexer::T_EMPTY) {
2591 2591
             return $this->EmptyCollectionComparisonExpression();
2592 2592
         }
2593 2593
 
Please login to merge, or discard this patch.
tests/Doctrine/Tests/ORM/Tools/Pagination/WhereInWalkerTest.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
     {
19 19
         parent::setUp();
20 20
 
21
-        if (! Type::hasType('rot13')) {
21
+        if ( ! Type::hasType('rot13')) {
22 22
             Type::addType('rot13', Rot13Type::class);
23 23
         }
24 24
     }
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
      */
189 189
     public function testWhereInQueryWithArbitraryJoin_NoWhere()
190 190
     {
191
-        $whereInQuery  = $this->entityManager->createQuery(
191
+        $whereInQuery = $this->entityManager->createQuery(
192 192
             'SELECT p FROM Doctrine\Tests\ORM\Tools\Pagination\BlogPost p JOIN Doctrine\Tests\ORM\Tools\Pagination\Category c WITH p.category = c'
193 193
         );
194 194
         $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, [WhereInWalker::class]);
@@ -227,7 +227,7 @@  discard block
 block discarded – undo
227 227
     public function testWillReplaceBoundQueryIdentifiersWithConvertedTypesAsPerIdentifierMapping() : void
228 228
     {
229 229
         $whereInQuery = $this->entityManager->createQuery(
230
-            'SELECT e.id4 FROM ' . AuxiliaryEntity::class . ' e'
230
+            'SELECT e.id4 FROM '.AuxiliaryEntity::class.' e'
231 231
         );
232 232
         $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, [WhereInWalker::class]);
233 233
         $whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 3);
@@ -242,7 +242,7 @@  discard block
 block discarded – undo
242 242
     public function testWillReplaceBoundQueryIdentifiersWithConvertedTypesAsPerAssociatedEntityIdentifierMapping() : void
243 243
     {
244 244
         $whereInQuery = $this->entityManager->createQuery(
245
-            'SELECT e FROM ' . OwningManyToOneIdForeignKeyEntity::class . ' e'
245
+            'SELECT e FROM '.OwningManyToOneIdForeignKeyEntity::class.' e'
246 246
         );
247 247
         $whereInQuery->setHint(Query::HINT_CUSTOM_TREE_WALKERS, [WhereInWalker::class]);
248 248
         $whereInQuery->setHint(WhereInWalker::HINT_PAGINATOR_ID_COUNT, 3);
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Tools/Pagination/WhereInWalker.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
                 [$pathExpression]
109 109
             );
110 110
             $expression = new InExpression($arithmeticExpression);
111
-            $expression->literals[] = new InputParameter(":" . self::PAGINATOR_ID_ALIAS);
111
+            $expression->literals[] = new InputParameter(":".self::PAGINATOR_ID_ALIAS);
112 112
 
113 113
             $this->convertWhereInIdentifiersToDatabaseValue(
114 114
                 PersisterHelper::getTypeOfField(
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
177 177
             ->getEntityManager()
178 178
             ->getConnection();
179 179
 
180
-        $query->setParameter(self::PAGINATOR_ID_ALIAS, array_map(static function ($id) use ($connection, $type) {
180
+        $query->setParameter(self::PAGINATOR_ID_ALIAS, array_map(static function($id) use ($connection, $type) {
181 181
             return $connection->convertToDatabaseValue($id, $type);
182 182
         }, $identifiers));
183 183
     }
Please login to merge, or discard this patch.
tests/Doctrine/Tests/ORM/Functional/GH5988Test.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
     {
22 22
         parent::setUp();
23 23
 
24
-        if (! DBALType::hasType(GH5988CustomIdObjectHashType::class)) {
24
+        if ( ! DBALType::hasType(GH5988CustomIdObjectHashType::class)) {
25 25
             DBALType::addType(GH5988CustomIdObjectHashType::class, GH5988CustomIdObjectHashType::class);
26 26
         }
27 27
 
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
      */
55 55
     public function convertToDatabaseValue($value, AbstractPlatform $platform)
56 56
     {
57
-        return $value->id . '_test';
57
+        return $value->id.'_test';
58 58
     }
59 59
     /**
60 60
      * {@inheritdoc}
Please login to merge, or discard this patch.
tests/Doctrine/Tests/ORM/Functional/SchemaTool/MySqlSchemaToolTest.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
     protected function setUp() {
14 14
         parent::setUp();
15 15
         if ($this->_em->getConnection()->getDatabasePlatform()->getName() !== 'mysql') {
16
-            $this->markTestSkipped('The ' . __CLASS__ .' requires the use of mysql.');
16
+            $this->markTestSkipped('The '.__CLASS__.' requires the use of mysql.');
17 17
         }
18 18
     }
19 19
 
@@ -32,14 +32,14 @@  discard block
 block discarded – undo
32 32
         $sql = $tool->getCreateSchemaSql($classes);
33 33
         $collation = $this->getColumnCollationDeclarationSQL('utf8_unicode_ci');
34 34
 
35
-        $this->assertEquals('CREATE TABLE cms_groups (id INT AUTO_INCREMENT NOT NULL, name VARCHAR(50) NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 ' . $collation . ' ENGINE = InnoDB', $sql[0]);
36
-        $this->assertEquals('CREATE TABLE cms_users (id INT AUTO_INCREMENT NOT NULL, email_id INT DEFAULT NULL, status VARCHAR(50) DEFAULT NULL, username VARCHAR(255) NOT NULL, name VARCHAR(255) NOT NULL, UNIQUE INDEX UNIQ_3AF03EC5F85E0677 (username), UNIQUE INDEX UNIQ_3AF03EC5A832C1C9 (email_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 ' . $collation . ' ENGINE = InnoDB', $sql[1]);
37
-        $this->assertEquals('CREATE TABLE cms_users_groups (user_id INT NOT NULL, group_id INT NOT NULL, INDEX IDX_7EA9409AA76ED395 (user_id), INDEX IDX_7EA9409AFE54D947 (group_id), PRIMARY KEY(user_id, group_id)) DEFAULT CHARACTER SET utf8 ' . $collation . ' ENGINE = InnoDB', $sql[2]);
38
-        $this->assertEquals('CREATE TABLE cms_users_tags (user_id INT NOT NULL, tag_id INT NOT NULL, INDEX IDX_93F5A1ADA76ED395 (user_id), INDEX IDX_93F5A1ADBAD26311 (tag_id), PRIMARY KEY(user_id, tag_id)) DEFAULT CHARACTER SET utf8 ' . $collation . ' ENGINE = InnoDB', $sql[3]);
39
-        $this->assertEquals('CREATE TABLE cms_tags (id INT AUTO_INCREMENT NOT NULL, tag_name VARCHAR(50) DEFAULT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 ' . $collation . ' ENGINE = InnoDB', $sql[4]);
40
-        $this->assertEquals('CREATE TABLE cms_addresses (id INT AUTO_INCREMENT NOT NULL, user_id INT DEFAULT NULL, country VARCHAR(50) NOT NULL, zip VARCHAR(50) NOT NULL, city VARCHAR(50) NOT NULL, UNIQUE INDEX UNIQ_ACAC157BA76ED395 (user_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 ' . $collation . ' ENGINE = InnoDB', $sql[5]);
41
-        $this->assertEquals('CREATE TABLE cms_emails (id INT AUTO_INCREMENT NOT NULL, email VARCHAR(250) NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 ' . $collation . ' ENGINE = InnoDB', $sql[6]);
42
-        $this->assertEquals('CREATE TABLE cms_phonenumbers (phonenumber VARCHAR(50) NOT NULL, user_id INT DEFAULT NULL, INDEX IDX_F21F790FA76ED395 (user_id), PRIMARY KEY(phonenumber)) DEFAULT CHARACTER SET utf8 ' . $collation . ' ENGINE = InnoDB', $sql[7]);
35
+        $this->assertEquals('CREATE TABLE cms_groups (id INT AUTO_INCREMENT NOT NULL, name VARCHAR(50) NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 '.$collation.' ENGINE = InnoDB', $sql[0]);
36
+        $this->assertEquals('CREATE TABLE cms_users (id INT AUTO_INCREMENT NOT NULL, email_id INT DEFAULT NULL, status VARCHAR(50) DEFAULT NULL, username VARCHAR(255) NOT NULL, name VARCHAR(255) NOT NULL, UNIQUE INDEX UNIQ_3AF03EC5F85E0677 (username), UNIQUE INDEX UNIQ_3AF03EC5A832C1C9 (email_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 '.$collation.' ENGINE = InnoDB', $sql[1]);
37
+        $this->assertEquals('CREATE TABLE cms_users_groups (user_id INT NOT NULL, group_id INT NOT NULL, INDEX IDX_7EA9409AA76ED395 (user_id), INDEX IDX_7EA9409AFE54D947 (group_id), PRIMARY KEY(user_id, group_id)) DEFAULT CHARACTER SET utf8 '.$collation.' ENGINE = InnoDB', $sql[2]);
38
+        $this->assertEquals('CREATE TABLE cms_users_tags (user_id INT NOT NULL, tag_id INT NOT NULL, INDEX IDX_93F5A1ADA76ED395 (user_id), INDEX IDX_93F5A1ADBAD26311 (tag_id), PRIMARY KEY(user_id, tag_id)) DEFAULT CHARACTER SET utf8 '.$collation.' ENGINE = InnoDB', $sql[3]);
39
+        $this->assertEquals('CREATE TABLE cms_tags (id INT AUTO_INCREMENT NOT NULL, tag_name VARCHAR(50) DEFAULT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 '.$collation.' ENGINE = InnoDB', $sql[4]);
40
+        $this->assertEquals('CREATE TABLE cms_addresses (id INT AUTO_INCREMENT NOT NULL, user_id INT DEFAULT NULL, country VARCHAR(50) NOT NULL, zip VARCHAR(50) NOT NULL, city VARCHAR(50) NOT NULL, UNIQUE INDEX UNIQ_ACAC157BA76ED395 (user_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 '.$collation.' ENGINE = InnoDB', $sql[5]);
41
+        $this->assertEquals('CREATE TABLE cms_emails (id INT AUTO_INCREMENT NOT NULL, email VARCHAR(250) NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 '.$collation.' ENGINE = InnoDB', $sql[6]);
42
+        $this->assertEquals('CREATE TABLE cms_phonenumbers (phonenumber VARCHAR(50) NOT NULL, user_id INT DEFAULT NULL, INDEX IDX_F21F790FA76ED395 (user_id), PRIMARY KEY(phonenumber)) DEFAULT CHARACTER SET utf8 '.$collation.' ENGINE = InnoDB', $sql[7]);
43 43
         $this->assertEquals("ALTER TABLE cms_users ADD CONSTRAINT FK_3AF03EC5A832C1C9 FOREIGN KEY (email_id) REFERENCES cms_emails (id)", $sql[8]);
44 44
         $this->assertEquals("ALTER TABLE cms_users_groups ADD CONSTRAINT FK_7EA9409AA76ED395 FOREIGN KEY (user_id) REFERENCES cms_users (id)", $sql[9]);
45 45
         $this->assertEquals("ALTER TABLE cms_users_groups ADD CONSTRAINT FK_7EA9409AFE54D947 FOREIGN KEY (group_id) REFERENCES cms_groups (id)", $sql[10]);
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
         $collation = $this->getColumnCollationDeclarationSQL('utf8_unicode_ci');
72 72
 
73 73
         $this->assertEquals(1, count($sql));
74
-        $this->assertEquals('CREATE TABLE decimal_model (id INT AUTO_INCREMENT NOT NULL, `decimal` NUMERIC(5, 2) NOT NULL, `high_scale` NUMERIC(14, 4) NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 ' . $collation . ' ENGINE = InnoDB', $sql[0]);
74
+        $this->assertEquals('CREATE TABLE decimal_model (id INT AUTO_INCREMENT NOT NULL, `decimal` NUMERIC(5, 2) NOT NULL, `high_scale` NUMERIC(14, 4) NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 '.$collation.' ENGINE = InnoDB', $sql[0]);
75 75
     }
76 76
 
77 77
     public function testGetCreateSchemaSql3()
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
         $collation = $this->getColumnCollationDeclarationSQL('utf8_unicode_ci');
86 86
 
87 87
         $this->assertEquals(1, count($sql));
88
-        $this->assertEquals('CREATE TABLE boolean_model (id INT AUTO_INCREMENT NOT NULL, booleanField TINYINT(1) NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 ' . $collation . ' ENGINE = InnoDB', $sql[0]);
88
+        $this->assertEquals('CREATE TABLE boolean_model (id INT AUTO_INCREMENT NOT NULL, booleanField TINYINT(1) NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 '.$collation.' ENGINE = InnoDB', $sql[0]);
89 89
     }
90 90
 
91 91
     /**
Please login to merge, or discard this patch.
tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2182Test.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -21,8 +21,8 @@
 block discarded – undo
21 21
         );
22 22
         $collation = $this->getColumnCollationDeclarationSQL('utf8_unicode_ci');
23 23
 
24
-        $this->assertEquals('CREATE TABLE DDC2182OptionParent (id INT UNSIGNED NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 ' . $collation . ' ENGINE = InnoDB', $sql[0]);
25
-        $this->assertEquals('CREATE TABLE DDC2182OptionChild (id VARCHAR(255) NOT NULL, parent_id INT UNSIGNED DEFAULT NULL, INDEX IDX_B314D4AD727ACA70 (parent_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 ' . $collation . ' ENGINE = InnoDB', $sql[1]);
24
+        $this->assertEquals('CREATE TABLE DDC2182OptionParent (id INT UNSIGNED NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 '.$collation.' ENGINE = InnoDB', $sql[0]);
25
+        $this->assertEquals('CREATE TABLE DDC2182OptionChild (id VARCHAR(255) NOT NULL, parent_id INT UNSIGNED DEFAULT NULL, INDEX IDX_B314D4AD727ACA70 (parent_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 '.$collation.' ENGINE = InnoDB', $sql[1]);
26 26
         $this->assertEquals("ALTER TABLE DDC2182OptionChild ADD CONSTRAINT FK_B314D4AD727ACA70 FOREIGN KEY (parent_id) REFERENCES DDC2182OptionParent (id)", $sql[2]);
27 27
     }
28 28
 
Please login to merge, or discard this patch.
tests/Doctrine/Tests/ORM/Functional/Ticket/GH7684Test.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@
 block discarded – undo
16 16
 {
17 17
     public function testIssue() : void
18 18
     {
19
-        if (! $this->_em->getConnection()->getDatabasePlatform()->supportsForeignKeyConstraints()) {
19
+        if ( ! $this->_em->getConnection()->getDatabasePlatform()->supportsForeignKeyConstraints()) {
20 20
             $this->markTestSkipped('Platform does not support foreign keys.');
21 21
         }
22 22
 
Please login to merge, or discard this patch.
tests/Doctrine/Tests/ORM/Functional/Ticket/GH7820Test.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -49,13 +49,13 @@  discard block
 block discarded – undo
49 49
     {
50 50
         parent::setUp();
51 51
 
52
-        if (! Type::hasType(GH7820LineTextType::class)) {
52
+        if ( ! Type::hasType(GH7820LineTextType::class)) {
53 53
             Type::addType(GH7820LineTextType::class, GH7820LineTextType::class);
54 54
         }
55 55
 
56 56
         $this->setUpEntitySchema([GH7820Line::class]);
57 57
 
58
-        $this->_em->createQuery('DELETE FROM ' . GH7820Line::class . ' l')
58
+        $this->_em->createQuery('DELETE FROM '.GH7820Line::class.' l')
59 59
             ->execute();
60 60
 
61 61
         foreach (self::SONG as $index => $line) {
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 
74 74
         self::assertSame(
75 75
             self::SONG,
76
-            array_map(static function (GH7820Line $line) : string {
76
+            array_map(static function(GH7820Line $line) : string {
77 77
                 return $line->toString();
78 78
             }, iterator_to_array(new Paginator($query)))
79 79
         );
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
 
96 96
         self::assertSame(
97 97
             self::SONG,
98
-            array_map(static function (GH7820Line $line) : string {
98
+            array_map(static function(GH7820Line $line) : string {
99 99
                 return $line->toString();
100 100
             }, iterator_to_array(new Paginator($query))),
101 101
             'Expected to return expected data before query cache is populated with DQL -> SQL translation. Were SQL parameters translated?'
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
 
108 108
         self::assertSame(
109 109
             self::SONG,
110
-            array_map(static function (GH7820Line $line) : string {
110
+            array_map(static function(GH7820Line $line) : string {
111 111
                 return $line->toString();
112 112
             }, iterator_to_array(new Paginator($query))),
113 113
             'Expected to return expected data even when DQL -> SQL translation is present in cache. Were SQL parameters translated again?'
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
 
166 166
     public function __toString() : string
167 167
     {
168
-        return 'Line: ' . $this->text;
168
+        return 'Line: '.$this->text;
169 169
     }
170 170
 }
171 171
 
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
175 175
     {
176 176
         $text = parent::convertToPHPValue($value, $platform);
177 177
 
178
-        if (! is_string($text)) {
178
+        if ( ! is_string($text)) {
179 179
             return $text;
180 180
         }
181 181
 
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
 
185 185
     public function convertToDatabaseValue($value, AbstractPlatform $platform)
186 186
     {
187
-        if (! $value instanceof GH7820LineText) {
187
+        if ( ! $value instanceof GH7820LineText) {
188 188
             return parent::convertToDatabaseValue($value, $platform);
189 189
         }
190 190
 
Please login to merge, or discard this patch.
tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
     {
45 45
         $driverMock = new DriverMock();
46 46
         $config = new Configuration();
47
-        $config->setProxyDir(__DIR__ . '/../../Proxies');
47
+        $config->setProxyDir(__DIR__.'/../../Proxies');
48 48
         $config->setProxyNamespace('Doctrine\Tests\Proxies');
49 49
         $eventManager = new EventManager();
50 50
         $conn = new ConnectionMock([], $driverMock, $config, $eventManager);
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
             'yaml'       => YamlDriver::class,
63 63
         ];
64 64
 
65
-        $this->assertArrayHasKey($type, $mappingDriver, "There is no metadata driver for the type '" . $type . "'.");
65
+        $this->assertArrayHasKey($type, $mappingDriver, "There is no metadata driver for the type '".$type."'.");
66 66
 
67 67
         $class  = $mappingDriver[$type];
68 68
         $driver = ($type === 'annotation')
@@ -85,10 +85,10 @@  discard block
 block discarded – undo
85 85
 
86 86
     public function testExportDirectoryAndFilesAreCreated()
87 87
     {
88
-        $this->_deleteDirectory(__DIR__ . '/export/'.$this->_getType());
88
+        $this->_deleteDirectory(__DIR__.'/export/'.$this->_getType());
89 89
 
90 90
         $type = $this->_getType();
91
-        $metadataDriver = $this->_createMetadataDriver($type, __DIR__ . '/' . $type);
91
+        $metadataDriver = $this->_createMetadataDriver($type, __DIR__.'/'.$type);
92 92
         $em = $this->_createEntityManager($metadataDriver);
93 93
         $cmf = $this->_createClassMetadataFactory($em, $type);
94 94
         $metadata = $cmf->getAllMetadata();
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
 
100 100
         $type = $this->_getType();
101 101
         $cme = new ClassMetadataExporter();
102
-        $exporter = $cme->getExporter($type, __DIR__ . '/export/' . $type);
102
+        $exporter = $cme->getExporter($type, __DIR__.'/export/'.$type);
103 103
 
104 104
         if ($type === 'annotation') {
105 105
             $entityGenerator = new EntityGenerator();
@@ -114,9 +114,9 @@  discard block
 block discarded – undo
114 114
         $exporter->export();
115 115
 
116 116
         if ($type == 'annotation') {
117
-            $this->assertTrue(file_exists(__DIR__ . '/export/' . $type . '/'.str_replace('\\', '/', ExportedUser::class).$this->_extension));
117
+            $this->assertTrue(file_exists(__DIR__.'/export/'.$type.'/'.str_replace('\\', '/', ExportedUser::class).$this->_extension));
118 118
         } else {
119
-            $this->assertTrue(file_exists(__DIR__ . '/export/' . $type . '/Doctrine.Tests.ORM.Tools.Export.ExportedUser'.$this->_extension));
119
+            $this->assertTrue(file_exists(__DIR__.'/export/'.$type.'/Doctrine.Tests.ORM.Tools.Export.ExportedUser'.$this->_extension));
120 120
         }
121 121
 
122 122
         $this->assertHasDeprecationMessages();
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
129 129
     {
130 130
         $type = $this->_getType();
131 131
 
132
-        $metadataDriver = $this->_createMetadataDriver($type, __DIR__ . '/export/' . $type);
132
+        $metadataDriver = $this->_createMetadataDriver($type, __DIR__.'/export/'.$type);
133 133
         $em = $this->_createEntityManager($metadataDriver);
134 134
         $cmf = $this->_createClassMetadataFactory($em, $type);
135 135
         $metadata = $cmf->getAllMetadata();
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
         $type = $this->_getType();
216 216
 
217 217
         if ($type == 'xml') {
218
-            $xml = simplexml_load_file(__DIR__ . '/export/'.$type.'/Doctrine.Tests.ORM.Tools.Export.ExportedUser.dcm.xml');
218
+            $xml = simplexml_load_file(__DIR__.'/export/'.$type.'/Doctrine.Tests.ORM.Tools.Export.ExportedUser.dcm.xml');
219 219
 
220 220
             $xml->registerXPathNamespace("d", "http://doctrine-project.org/schemas/orm/doctrine-mapping");
221 221
             $nodes = $xml->xpath("/d:doctrine-mapping/d:entity/d:field[@name='name' and @type='string' and @nullable='true']");
@@ -359,7 +359,7 @@  discard block
 block discarded – undo
359 359
         $type = $this->_getType();
360 360
 
361 361
         if ($type == 'xml') {
362
-            $xml = simplexml_load_file(__DIR__ . '/export/'.$type.'/Doctrine.Tests.ORM.Tools.Export.ExportedUser.dcm.xml');
362
+            $xml = simplexml_load_file(__DIR__.'/export/'.$type.'/Doctrine.Tests.ORM.Tools.Export.ExportedUser.dcm.xml');
363 363
 
364 364
             $xml->registerXPathNamespace("d", "http://doctrine-project.org/schemas/orm/doctrine-mapping");
365 365
             $nodes = $xml->xpath("/d:doctrine-mapping/d:entity/d:one-to-many[@field='interests']/d:cascade/d:*");
@@ -368,7 +368,7 @@  discard block
 block discarded – undo
368 368
             $this->assertEquals('cascade-all', $nodes[0]->getName());
369 369
         } else if ($type == 'yaml') {
370 370
             $yaml = new Parser();
371
-            $value = $yaml->parse(file_get_contents(__DIR__ . '/export/'.$type.'/Doctrine.Tests.ORM.Tools.Export.ExportedUser.dcm.yml'));
371
+            $value = $yaml->parse(file_get_contents(__DIR__.'/export/'.$type.'/Doctrine.Tests.ORM.Tools.Export.ExportedUser.dcm.yml'));
372 372
 
373 373
             $this->assertTrue(isset($value[ExportedUser::class]['oneToMany']['interests']['cascade']));
374 374
             $this->assertEquals(1, count($value[ExportedUser::class]['oneToMany']['interests']['cascade']));
@@ -408,10 +408,10 @@  discard block
 block discarded – undo
408 408
         if (is_file($path)) {
409 409
             return unlink($path);
410 410
         } else if (is_dir($path)) {
411
-            $files = glob(rtrim($path,'/').'/*');
411
+            $files = glob(rtrim($path, '/').'/*');
412 412
 
413 413
             if (is_array($files)) {
414
-                foreach ($files as $file){
414
+                foreach ($files as $file) {
415 415
                     $this->_deleteDirectory($file);
416 416
                 }
417 417
             }
Please login to merge, or discard this patch.