Completed
Pull Request — master (#7825)
by
unknown
09:49
created
tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3644Test.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
     {
157 157
         $this->addresses = $addresses;
158 158
 
159
-        $addresses->map(function ($address) {
159
+        $addresses->map(function($address) {
160 160
             $address->user = $this;
161 161
         });
162 162
     }
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
     {
166 166
         $this->pets = $pets;
167 167
 
168
-        $pets->map(function ($pet) {
168
+        $pets->map(function($pet) {
169 169
             $pet->owner = $this;
170 170
         });
171 171
     }
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Mapping/Builder/ToOneAssociationMetadataBuilder.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
                 );
84 84
             }
85 85
 
86
-            if (! $associationMetadata->isOwningSide()) {
86
+            if ( ! $associationMetadata->isOwningSide()) {
87 87
                 throw Mapping\MappingException::illegalInverseIdentifierAssociation(
88 88
                     $this->componentMetadata->getClassName(),
89 89
                     $this->fieldName
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
             // @todo guilhermeblanco The below block of code modifies component metadata properties, and it should be moved
101 101
             //                       to the component metadata builder instead of here.
102 102
 
103
-            if (! in_array($this->fieldName, $this->componentMetadata->identifier, true)) {
103
+            if ( ! in_array($this->fieldName, $this->componentMetadata->identifier, true)) {
104 104
                 $this->componentMetadata->identifier[] = $this->fieldName;
105 105
             }
106 106
 
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Mapping/Builder/OneToManyAssociationMetadataBuilder.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@
 block discarded – undo
46 46
         $associationMetadata->setOwningSide(false);
47 47
         $associationMetadata->setMappedBy($this->oneToManyAnnotation->mappedBy);
48 48
 
49
-        if (! empty($this->oneToManyAnnotation->indexBy)) {
49
+        if ( ! empty($this->oneToManyAnnotation->indexBy)) {
50 50
             $associationMetadata->setIndexedBy($this->oneToManyAnnotation->indexBy);
51 51
         }
52 52
 
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Mapping/Builder/ManyToManyAssociationMetadataBuilder.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -86,16 +86,16 @@  discard block
 block discarded – undo
86 86
         $associationMetadata->setFetchMode($this->getFetchMode($this->manyToManyAnnotation->fetch));
87 87
         $associationMetadata->setOwningSide(true);
88 88
 
89
-        if (! empty($this->manyToManyAnnotation->mappedBy)) {
89
+        if ( ! empty($this->manyToManyAnnotation->mappedBy)) {
90 90
             $associationMetadata->setMappedBy($this->manyToManyAnnotation->mappedBy);
91 91
             $associationMetadata->setOwningSide(false);
92 92
         }
93 93
 
94
-        if (! empty($this->manyToManyAnnotation->inversedBy)) {
94
+        if ( ! empty($this->manyToManyAnnotation->inversedBy)) {
95 95
             $associationMetadata->setInversedBy($this->manyToManyAnnotation->inversedBy);
96 96
         }
97 97
 
98
-        if (! empty($this->manyToManyAnnotation->indexBy)) {
98
+        if ( ! empty($this->manyToManyAnnotation->indexBy)) {
99 99
             $associationMetadata->setIndexedBy($this->manyToManyAnnotation->indexBy);
100 100
         }
101 101
 
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
         $this->buildCache($associationMetadata);
114 114
 
115 115
         // Check for owning side to consider join column
116
-        if (! $associationMetadata->isOwningSide()) {
116
+        if ( ! $associationMetadata->isOwningSide()) {
117 117
             return $associationMetadata;
118 118
         }
119 119
 
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Mapping/Builder/AssociationMetadataBuilder.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -90,12 +90,12 @@  discard block
 block discarded – undo
90 90
     protected function getTargetEntity(string $targetEntity) : string
91 91
     {
92 92
         // Validate if target entity is defined
93
-        if (! $targetEntity) {
93
+        if ( ! $targetEntity) {
94 94
             throw Mapping\MappingException::missingTargetEntity($this->fieldName);
95 95
         }
96 96
 
97 97
         // Validate that target entity exists
98
-        if (! (class_exists($targetEntity) || interface_exists($targetEntity))) {
98
+        if ( ! (class_exists($targetEntity) || interface_exists($targetEntity))) {
99 99
             throw Mapping\MappingException::invalidTargetEntityClass(
100 100
                 $targetEntity,
101 101
                 $this->componentMetadata->getClassName(),
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
     {
151 151
         $fetchModeConstant = sprintf('%s::%s', Mapping\FetchMode::class, $fetchMode);
152 152
 
153
-        if (! defined($fetchModeConstant)) {
153
+        if ( ! defined($fetchModeConstant)) {
154 154
             throw Mapping\MappingException::invalidFetchMode($this->componentMetadata->getClassName(), $fetchMode);
155 155
         }
156 156
 
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Mapping/Builder/ManyToOneAssociationMetadataBuilder.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@
 block discarded – undo
41 41
         $associationMetadata->setFetchMode($this->getFetchMode($this->manyToOneAnnotation->fetch));
42 42
         $associationMetadata->setOwningSide(true);
43 43
 
44
-        if (! empty($this->manyToOneAnnotation->inversedBy)) {
44
+        if ( ! empty($this->manyToOneAnnotation->inversedBy)) {
45 45
             $associationMetadata->setInversedBy($this->manyToOneAnnotation->inversedBy);
46 46
         }
47 47
 
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Mapping/Builder/OneToOneAssociationMetadataBuilder.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -51,12 +51,12 @@  discard block
 block discarded – undo
51 51
             $associationMetadata->setCascade(array_unique(array_merge($associationMetadata->getCascade(), ['remove'])));
52 52
         }
53 53
 
54
-        if (! empty($this->oneToOneAnnotation->mappedBy)) {
54
+        if ( ! empty($this->oneToOneAnnotation->mappedBy)) {
55 55
             $associationMetadata->setMappedBy($this->oneToOneAnnotation->mappedBy);
56 56
             $associationMetadata->setOwningSide(false);
57 57
         }
58 58
 
59
-        if (! empty($this->oneToOneAnnotation->inversedBy)) {
59
+        if ( ! empty($this->oneToOneAnnotation->inversedBy)) {
60 60
             $associationMetadata->setInversedBy($this->oneToOneAnnotation->inversedBy);
61 61
             $associationMetadata->setOwningSide(true);
62 62
         }
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
         $this->buildPrimaryKey($associationMetadata);
66 66
 
67 67
         // Check for owning side to consider join column
68
-        if (! $associationMetadata->isOwningSide()) {
68
+        if ( ! $associationMetadata->isOwningSide()) {
69 69
             return $associationMetadata;
70 70
         }
71 71
 
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
         if (count($joinColumns) === 1) {
90 90
             $joinColumn = reset($joinColumns);
91 91
 
92
-            if (! $associationMetadata->isPrimaryKey()) {
92
+            if ( ! $associationMetadata->isPrimaryKey()) {
93 93
                 $joinColumn->setUnique(true);
94 94
             }
95 95
 
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
 
99 99
         $tableMetadata = $this->componentMetadata->table;
100 100
 
101
-        if (! $tableMetadata) {
101
+        if ( ! $tableMetadata) {
102 102
             $exception = 'ClassMetadata::setTable() has to be called before defining a one to one relationship.';
103 103
 
104 104
             throw new RuntimeException($exception);
Please login to merge, or discard this patch.
tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
 use function strtoupper;
37 37
 use function unserialize;
38 38
 
39
-require_once __DIR__ . '/../../Models/Global/GlobalNamespaceModel.php';
39
+require_once __DIR__.'/../../Models/Global/GlobalNamespaceModel.php';
40 40
 
41 41
 class ClassMetadataTest extends OrmTestCase
42 42
 {
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
      */
166 166
     public function testMapAssociationInGlobalNamespace() : void
167 167
     {
168
-        require_once __DIR__ . '/../../Models/Global/GlobalNamespaceModel.php';
168
+        require_once __DIR__.'/../../Models/Global/GlobalNamespaceModel.php';
169 169
 
170 170
         $cm = new ClassMetadata(DoctrineGlobalArticle::class, null);
171 171
         $cm->setTable(new Mapping\TableMetadata('doctrine_global_article'));
@@ -265,7 +265,7 @@  discard block
 block discarded – undo
265 265
      */
266 266
     public function testSetDiscriminatorMapInGlobalNamespace() : void
267 267
     {
268
-        require_once __DIR__ . '/../../Models/Global/GlobalNamespaceModel.php';
268
+        require_once __DIR__.'/../../Models/Global/GlobalNamespaceModel.php';
269 269
 
270 270
         $cm = new ClassMetadata('DoctrineGlobalUser', null);
271 271
         $cm->setTable(new Mapping\TableMetadata('doctrine_global_user'));
@@ -281,7 +281,7 @@  discard block
 block discarded – undo
281 281
      */
282 282
     public function testSetSubClassesInGlobalNamespace() : void
283 283
     {
284
-        require_once __DIR__ . '/../../Models/Global/GlobalNamespaceModel.php';
284
+        require_once __DIR__.'/../../Models/Global/GlobalNamespaceModel.php';
285 285
 
286 286
         $cm = new ClassMetadata('DoctrineGlobalUser', null);
287 287
         $cm->setTable(new Mapping\TableMetadata('doctrine_global_user'));
@@ -767,7 +767,7 @@  discard block
 block discarded – undo
767 767
     public function testEmptyFieldNameThrowsException() : void
768 768
     {
769 769
         $this->expectException(MappingException::class);
770
-        $this->expectExceptionMessage("The field or association mapping misses the 'fieldName' attribute in entity '" . CMS\CmsUser::class . "'.");
770
+        $this->expectExceptionMessage("The field or association mapping misses the 'fieldName' attribute in entity '".CMS\CmsUser::class."'.");
771 771
 
772 772
         $cm = new ClassMetadata(CMS\CmsUser::class, null);
773 773
         $cm->setTable(new Mapping\TableMetadata('cms_users'));
@@ -819,7 +819,7 @@  discard block
 block discarded – undo
819 819
         $cm->addLifecycleCallback('postLoad', 'notfound');
820 820
 
821 821
         $this->expectException(MappingException::class);
822
-        $this->expectExceptionMessage("Entity '" . CMS\CmsUser::class . "' has no public method 'notfound' to be registered as lifecycle callback.");
822
+        $this->expectExceptionMessage("Entity '".CMS\CmsUser::class."' has no public method 'notfound' to be registered as lifecycle callback.");
823 823
 
824 824
         $cm->validateLifecycleCallbacks(new RuntimeReflectionService());
825 825
     }
@@ -841,7 +841,7 @@  discard block
 block discarded – undo
841 841
         $cm->addProperty($association);
842 842
 
843 843
         $this->expectException(MappingException::class);
844
-        $this->expectExceptionMessage("The target-entity 'UnknownClass' cannot be found in '" . CMS\CmsUser::class . "#address'.");
844
+        $this->expectExceptionMessage("The target-entity 'UnknownClass' cannot be found in '".CMS\CmsUser::class."#address'.");
845 845
 
846 846
         $cm->validateAssociations();
847 847
     }
@@ -1089,6 +1089,6 @@  discard block
 block discarded – undo
1089 1089
      */
1090 1090
     public function propertyToColumnName(string $propertyName, ?string $className = null) : string
1091 1091
     {
1092
-        return strtolower($this->classToTableName($className)) . '_' . $propertyName;
1092
+        return strtolower($this->classToTableName($className)).'_'.$propertyName;
1093 1093
     }
1094 1094
 }
Please login to merge, or discard this patch.
lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -145,8 +145,8 @@  discard block
 block discarded – undo
145 145
     ) : Mapping\ComponentMetadata {
146 146
         $this->reverseEngineerMappingFromDatabase();
147 147
 
148
-        if (! isset($this->classToTableNames[$className])) {
149
-            throw new InvalidArgumentException('Unknown class ' . $className);
148
+        if ( ! isset($this->classToTableNames[$className])) {
149
+            throw new InvalidArgumentException('Unknown class '.$className);
150 150
         }
151 151
 
152 152
         $metadata = new Mapping\ClassMetadata($className, $parent);
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
175 175
                     }
176 176
                 }
177 177
 
178
-                if (! $otherFk) {
178
+                if ( ! $otherFk) {
179 179
                     // the definition of this many to many table does not contain
180 180
                     // enough foreign key information to continue reverse engineering.
181 181
                     continue;
@@ -258,9 +258,9 @@  discard block
 block discarded – undo
258 258
                 $allForeignKeyColumns = array_merge($allForeignKeyColumns, $foreignKey->getLocalColumns());
259 259
             }
260 260
 
261
-            if (! $table->hasPrimaryKey()) {
261
+            if ( ! $table->hasPrimaryKey()) {
262 262
                 throw new Mapping\MappingException(
263
-                    'Table ' . $table->getName() . ' has no primary key. Doctrine does not ' .
263
+                    'Table '.$table->getName().' has no primary key. Doctrine does not '.
264 264
                     "support reverse engineering from tables that don't have a primary key."
265 265
                 );
266 266
             }
@@ -457,7 +457,7 @@  discard block
 block discarded – undo
457 457
             }
458 458
 
459 459
             // Here we need to check if $fkColumns are the same as $primaryKeys
460
-            if (! array_diff($fkColumns, $primaryKeys)) {
460
+            if ( ! array_diff($fkColumns, $primaryKeys)) {
461 461
                 $metadata->addProperty($associationMapping);
462 462
             } else {
463 463
                 $metadata->addProperty($associationMapping);
@@ -502,7 +502,7 @@  discard block
 block discarded – undo
502 502
      */
503 503
     private function getClassNameForTable($tableName)
504 504
     {
505
-        return $this->namespace . (
505
+        return $this->namespace.(
506 506
             $this->classNamesForTables[$tableName]
507 507
                 ?? Inflector::classify(strtolower($tableName))
508 508
         );
Please login to merge, or discard this patch.