Completed
Pull Request — develop (#6743)
by Grégoire
65:46
created
tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php 3 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1241,7 +1241,7 @@
 block discarded – undo
1241 1241
         $association->setCascade(['invalid']);
1242 1242
 
1243 1243
         $cm->addProperty($association);
1244
-     }
1244
+        }
1245 1245
 
1246 1246
     /**
1247 1247
      * @group DDC-964
Please login to merge, or discard this patch.
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,6 @@
 block discarded – undo
29 29
 use Doctrine\Tests\Models\Routing\RoutingLeg;
30 30
 use Doctrine\Tests\OrmTestCase;
31 31
 use DoctrineGlobal_Article;
32
-use SebastianBergmann\Environment\Runtime;
33 32
 
34 33
 require_once __DIR__ . '/../../Models/Global/GlobalNamespaceModel.php';
35 34
 
Please login to merge, or discard this patch.
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-declare(strict_types=1);
3
+declare(strict_types = 1);
4 4
 
5 5
 namespace Doctrine\Tests\ORM\Mapping;
6 6
 
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
 use DoctrineGlobal_Article;
32 32
 use SebastianBergmann\Environment\Runtime;
33 33
 
34
-require_once __DIR__ . '/../../Models/Global/GlobalNamespaceModel.php';
34
+require_once __DIR__.'/../../Models/Global/GlobalNamespaceModel.php';
35 35
 
36 36
 class ClassMetadataTest extends OrmTestCase
37 37
 {
@@ -804,7 +804,7 @@  discard block
 block discarded – undo
804 804
     public function testEmptyFieldNameThrowsException()
805 805
     {
806 806
         $this->expectException(MappingException::class);
807
-        $this->expectExceptionMessage("The field or association mapping misses the 'fieldName' attribute in entity '" . CMS\CmsUser::class . "'.");
807
+        $this->expectExceptionMessage("The field or association mapping misses the 'fieldName' attribute in entity '".CMS\CmsUser::class."'.");
808 808
 
809 809
         $cm = new ClassMetadata(CMS\CmsUser::class, $this->metadataBuildingContext);
810 810
         $cm->setTable(new Mapping\TableMetadata('cms_users'));
@@ -947,12 +947,12 @@  discard block
 block discarded – undo
947 947
         $mapping = $cm->getSqlResultSetMapping('find-all');
948 948
 
949 949
         self::assertEquals('__CLASS__', $mapping['entities'][0]['entityClass']);
950
-        self::assertEquals(['name'=>'id','column'=>'id'], $mapping['entities'][0]['fields'][0]);
951
-        self::assertEquals(['name'=>'name','column'=>'name'], $mapping['entities'][0]['fields'][1]);
950
+        self::assertEquals(['name'=>'id', 'column'=>'id'], $mapping['entities'][0]['fields'][0]);
951
+        self::assertEquals(['name'=>'name', 'column'=>'name'], $mapping['entities'][0]['fields'][1]);
952 952
 
953 953
         self::assertEquals(CMS\CmsEmail::class, $mapping['entities'][1]['entityClass']);
954
-        self::assertEquals(['name'=>'id','column'=>'id'], $mapping['entities'][1]['fields'][0]);
955
-        self::assertEquals(['name'=>'email','column'=>'email'], $mapping['entities'][1]['fields'][1]);
954
+        self::assertEquals(['name'=>'id', 'column'=>'id'], $mapping['entities'][1]['fields'][0]);
955
+        self::assertEquals(['name'=>'email', 'column'=>'email'], $mapping['entities'][1]['fields'][1]);
956 956
 
957 957
         self::assertEquals('scalarColumn', $mapping['columns'][0]['name']);
958 958
     }
@@ -1149,7 +1149,7 @@  discard block
 block discarded – undo
1149 1149
         $cm->addLifecycleCallback('notfound', 'postLoad');
1150 1150
 
1151 1151
         $this->expectException(MappingException::class);
1152
-        $this->expectExceptionMessage("Entity '" . CMS\CmsUser::class . "' has no method 'notfound' to be registered as lifecycle callback.");
1152
+        $this->expectExceptionMessage("Entity '".CMS\CmsUser::class."' has no method 'notfound' to be registered as lifecycle callback.");
1153 1153
 
1154 1154
         $cm->validateLifecycleCallbacks(new RuntimeReflectionService());
1155 1155
     }
@@ -1169,7 +1169,7 @@  discard block
 block discarded – undo
1169 1169
         $cm->addProperty($association);
1170 1170
 
1171 1171
         $this->expectException(MappingException::class);
1172
-        $this->expectExceptionMessage("The target-entity 'UnknownClass' cannot be found in '" . CMS\CmsUser::class . "#address'.");
1172
+        $this->expectExceptionMessage("The target-entity 'UnknownClass' cannot be found in '".CMS\CmsUser::class."#address'.");
1173 1173
 
1174 1174
         $cm->validateAssociations();
1175 1175
     }
@@ -1510,6 +1510,6 @@  discard block
 block discarded – undo
1510 1510
      */
1511 1511
     public function propertyToColumnName($propertyName, $className = null)
1512 1512
     {
1513
-        return strtolower($this->classToTableName($className)) . '_' . $propertyName;
1513
+        return strtolower($this->classToTableName($className)).'_'.$propertyName;
1514 1514
     }
1515 1515
 }
Please login to merge, or discard this patch.
tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php 3 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -811,7 +811,7 @@
 block discarded – undo
811 811
         self::assertEquals($guestGroups->getFetchMode(), $adminGroups->getFetchMode());
812 812
         self::assertEquals($guestGroups->getCascade(), $adminGroups->getCascade());
813 813
 
814
-         // assert not override attributes
814
+            // assert not override attributes
815 815
         $guestGroupsJoinTable          = $guestGroups->getJoinTable();
816 816
         $guestGroupsJoinColumns        = $guestGroupsJoinTable->getJoinColumns();
817 817
         $guestGroupsJoinColumn         = reset($guestGroupsJoinColumns);
Please login to merge, or discard this patch.
Spacing   +39 added lines, -39 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-declare(strict_types=1);
3
+declare(strict_types = 1);
4 4
 
5 5
 namespace Doctrine\Tests\ORM\Mapping;
6 6
 
@@ -683,13 +683,13 @@  discard block
 block discarded – undo
683 683
 
684 684
         $findByIdQuery = $class->getNamedNativeQuery('find-by-id');
685 685
 
686
-        self::assertEquals(CmsAddress::class,$findByIdQuery['resultClass']);
687
-        self::assertEquals('SELECT * FROM cms_addresses WHERE id = ?',  $findByIdQuery['query']);
686
+        self::assertEquals(CmsAddress::class, $findByIdQuery['resultClass']);
687
+        self::assertEquals('SELECT * FROM cms_addresses WHERE id = ?', $findByIdQuery['query']);
688 688
 
689 689
         $countQuery = $class->getNamedNativeQuery('count');
690 690
 
691 691
         self::assertEquals('mapping-count', $countQuery['resultSetMapping']);
692
-        self::assertEquals('SELECT COUNT(*) AS count FROM cms_addresses',  $countQuery['query']);
692
+        self::assertEquals('SELECT COUNT(*) AS count FROM cms_addresses', $countQuery['query']);
693 693
 
694 694
         // result set mapping
695 695
         self::assertCount(3, $class->sqlResultSetMappings);
@@ -700,9 +700,9 @@  discard block
 block discarded – undo
700 700
         $findAllMapping = $class->getSqlResultSetMapping('mapping-find-all');
701 701
 
702 702
         self::assertEquals(CmsAddress::class, $findAllMapping['entities'][0]['entityClass']);
703
-        self::assertEquals(['name'=>'id','column'=>'id'], $findAllMapping['entities'][0]['fields'][0]);
704
-        self::assertEquals(['name'=>'city','column'=>'city'], $findAllMapping['entities'][0]['fields'][1]);
705
-        self::assertEquals(['name'=>'country','column'=>'country'], $findAllMapping['entities'][0]['fields'][2]);
703
+        self::assertEquals(['name'=>'id', 'column'=>'id'], $findAllMapping['entities'][0]['fields'][0]);
704
+        self::assertEquals(['name'=>'city', 'column'=>'city'], $findAllMapping['entities'][0]['fields'][1]);
705
+        self::assertEquals(['name'=>'country', 'column'=>'country'], $findAllMapping['entities'][0]['fields'][2]);
706 706
 
707 707
         $withoutFieldsMapping = $class->getSqlResultSetMapping('mapping-without-fields');
708 708
 
@@ -728,63 +728,63 @@  discard block
 block discarded – undo
728 728
 
729 729
         $mapping = $userMetadata->getSqlResultSetMapping('mappingJoinedAddress');
730 730
 
731
-        self::assertEquals([],$mapping['columns']);
731
+        self::assertEquals([], $mapping['columns']);
732 732
         self::assertEquals('mappingJoinedAddress', $mapping['name']);
733 733
 
734 734
         self::assertNull($mapping['entities'][0]['discriminatorColumn']);
735 735
 
736
-        self::assertEquals(['name'=>'id','column'=>'id'],                   $mapping['entities'][0]['fields'][0]);
737
-        self::assertEquals(['name'=>'name','column'=>'name'],               $mapping['entities'][0]['fields'][1]);
738
-        self::assertEquals(['name'=>'status','column'=>'status'],           $mapping['entities'][0]['fields'][2]);
739
-        self::assertEquals(['name'=>'address.zip','column'=>'zip'],         $mapping['entities'][0]['fields'][3]);
740
-        self::assertEquals(['name'=>'address.city','column'=>'city'],       $mapping['entities'][0]['fields'][4]);
741
-        self::assertEquals(['name'=>'address.country','column'=>'country'], $mapping['entities'][0]['fields'][5]);
742
-        self::assertEquals(['name'=>'address.id','column'=>'a_id'],         $mapping['entities'][0]['fields'][6]);
743
-        self::assertEquals('__CLASS__',                            $mapping['entities'][0]['entityClass']);
736
+        self::assertEquals(['name'=>'id', 'column'=>'id'], $mapping['entities'][0]['fields'][0]);
737
+        self::assertEquals(['name'=>'name', 'column'=>'name'], $mapping['entities'][0]['fields'][1]);
738
+        self::assertEquals(['name'=>'status', 'column'=>'status'], $mapping['entities'][0]['fields'][2]);
739
+        self::assertEquals(['name'=>'address.zip', 'column'=>'zip'], $mapping['entities'][0]['fields'][3]);
740
+        self::assertEquals(['name'=>'address.city', 'column'=>'city'], $mapping['entities'][0]['fields'][4]);
741
+        self::assertEquals(['name'=>'address.country', 'column'=>'country'], $mapping['entities'][0]['fields'][5]);
742
+        self::assertEquals(['name'=>'address.id', 'column'=>'a_id'], $mapping['entities'][0]['fields'][6]);
743
+        self::assertEquals('__CLASS__', $mapping['entities'][0]['entityClass']);
744 744
 
745 745
         $mapping = $userMetadata->getSqlResultSetMapping('mappingJoinedPhonenumber');
746 746
 
747
-        self::assertEquals([],$mapping['columns']);
747
+        self::assertEquals([], $mapping['columns']);
748 748
         self::assertEquals('mappingJoinedPhonenumber', $mapping['name']);
749 749
 
750 750
         self::assertNull($mapping['entities'][0]['discriminatorColumn']);
751 751
 
752
-        self::assertEquals(['name'=>'id','column'=>'id'],                             $mapping['entities'][0]['fields'][0]);
753
-        self::assertEquals(['name'=>'name','column'=>'name'],                         $mapping['entities'][0]['fields'][1]);
754
-        self::assertEquals(['name'=>'status','column'=>'status'],                     $mapping['entities'][0]['fields'][2]);
755
-        self::assertEquals(['name'=>'phonenumbers.phonenumber','column'=>'number'],   $mapping['entities'][0]['fields'][3]);
756
-        self::assertEquals($userMetadata->getClassName(),                             $mapping['entities'][0]['entityClass']);
752
+        self::assertEquals(['name'=>'id', 'column'=>'id'], $mapping['entities'][0]['fields'][0]);
753
+        self::assertEquals(['name'=>'name', 'column'=>'name'], $mapping['entities'][0]['fields'][1]);
754
+        self::assertEquals(['name'=>'status', 'column'=>'status'], $mapping['entities'][0]['fields'][2]);
755
+        self::assertEquals(['name'=>'phonenumbers.phonenumber', 'column'=>'number'], $mapping['entities'][0]['fields'][3]);
756
+        self::assertEquals($userMetadata->getClassName(), $mapping['entities'][0]['entityClass']);
757 757
 
758 758
         $mapping = $userMetadata->getSqlResultSetMapping('mappingUserPhonenumberCount');
759 759
 
760
-        self::assertEquals(['name'=>'numphones'],$mapping['columns'][0]);
760
+        self::assertEquals(['name'=>'numphones'], $mapping['columns'][0]);
761 761
         self::assertEquals('mappingUserPhonenumberCount', $mapping['name']);
762 762
 
763 763
         self::assertNull($mapping['entities'][0]['discriminatorColumn']);
764 764
 
765
-        self::assertEquals(['name'=>'id','column'=>'id'],         $mapping['entities'][0]['fields'][0]);
766
-        self::assertEquals(['name'=>'name','column'=>'name'],     $mapping['entities'][0]['fields'][1]);
767
-        self::assertEquals(['name'=>'status','column'=>'status'], $mapping['entities'][0]['fields'][2]);
768
-        self::assertEquals($userMetadata->getClassName(),         $mapping['entities'][0]['entityClass']);
765
+        self::assertEquals(['name'=>'id', 'column'=>'id'], $mapping['entities'][0]['fields'][0]);
766
+        self::assertEquals(['name'=>'name', 'column'=>'name'], $mapping['entities'][0]['fields'][1]);
767
+        self::assertEquals(['name'=>'status', 'column'=>'status'], $mapping['entities'][0]['fields'][2]);
768
+        self::assertEquals($userMetadata->getClassName(), $mapping['entities'][0]['entityClass']);
769 769
 
770 770
         $mapping = $userMetadata->getSqlResultSetMapping('mappingMultipleJoinsEntityResults');
771 771
 
772
-        self::assertEquals(['name'=>'numphones'],$mapping['columns'][0]);
772
+        self::assertEquals(['name'=>'numphones'], $mapping['columns'][0]);
773 773
         self::assertEquals('mappingMultipleJoinsEntityResults', $mapping['name']);
774 774
 
775 775
         self::assertNull($mapping['entities'][0]['discriminatorColumn']);
776 776
 
777
-        self::assertEquals(['name'=>'id','column'=>'u_id'],           $mapping['entities'][0]['fields'][0]);
778
-        self::assertEquals(['name'=>'name','column'=>'u_name'],       $mapping['entities'][0]['fields'][1]);
779
-        self::assertEquals(['name'=>'status','column'=>'u_status'],   $mapping['entities'][0]['fields'][2]);
780
-        self::assertEquals('__CLASS__',                      $mapping['entities'][0]['entityClass']);
777
+        self::assertEquals(['name'=>'id', 'column'=>'u_id'], $mapping['entities'][0]['fields'][0]);
778
+        self::assertEquals(['name'=>'name', 'column'=>'u_name'], $mapping['entities'][0]['fields'][1]);
779
+        self::assertEquals(['name'=>'status', 'column'=>'u_status'], $mapping['entities'][0]['fields'][2]);
780
+        self::assertEquals('__CLASS__', $mapping['entities'][0]['entityClass']);
781 781
 
782 782
         self::assertNull($mapping['entities'][1]['discriminatorColumn']);
783 783
 
784
-        self::assertEquals(['name'=>'id','column'=>'a_id'],           $mapping['entities'][1]['fields'][0]);
785
-        self::assertEquals(['name'=>'zip','column'=>'a_zip'],         $mapping['entities'][1]['fields'][1]);
786
-        self::assertEquals(['name'=>'country','column'=>'a_country'], $mapping['entities'][1]['fields'][2]);
787
-        self::assertEquals(CmsAddress::class,                $mapping['entities'][1]['entityClass']);
784
+        self::assertEquals(['name'=>'id', 'column'=>'a_id'], $mapping['entities'][1]['fields'][0]);
785
+        self::assertEquals(['name'=>'zip', 'column'=>'a_zip'], $mapping['entities'][1]['fields'][1]);
786
+        self::assertEquals(['name'=>'country', 'column'=>'a_country'], $mapping['entities'][1]['fields'][2]);
787
+        self::assertEquals(CmsAddress::class, $mapping['entities'][1]['entityClass']);
788 788
 
789 789
         //person asserts
790 790
         self::assertCount(1, $personMetadata->getSqlResultSetMappings());
@@ -796,9 +796,9 @@  discard block
 block discarded – undo
796 796
 
797 797
         self::assertEquals('discriminator', $mapping['entities'][0]['discriminatorColumn']);
798 798
 
799
-        self::assertEquals(['name'=>'id','column'=>'id'],     $mapping['entities'][0]['fields'][0]);
800
-        self::assertEquals(['name'=>'name','column'=>'name'], $mapping['entities'][0]['fields'][1]);
801
-        self::assertEquals('__CLASS__',              $mapping['entities'][0]['entityClass']);
799
+        self::assertEquals(['name'=>'id', 'column'=>'id'], $mapping['entities'][0]['fields'][0]);
800
+        self::assertEquals(['name'=>'name', 'column'=>'name'], $mapping['entities'][0]['fields'][1]);
801
+        self::assertEquals('__CLASS__', $mapping['entities'][0]['entityClass']);
802 802
     }
803 803
 
804 804
     /*
Please login to merge, or discard this patch.
Doc Comments   -2 removed lines patch added patch discarded remove patch
@@ -83,7 +83,6 @@  discard block
 block discarded – undo
83 83
     }
84 84
 
85 85
     /**
86
-     * @param ClassMetadata $class
87 86
      */
88 87
     public function testEntityTableNameAndInheritance()
89 88
     {
@@ -97,7 +96,6 @@  discard block
 block discarded – undo
97 96
 
98 97
     /**
99 98
      *
100
-     * @param ClassMetadata $class
101 99
      */
102 100
     public function testEntityIndexes()
103 101
     {
Please login to merge, or discard this patch.
tests/Doctrine/Tests/ORM/Mapping/EntityListenerResolverTest.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-declare(strict_types=1);
3
+declare(strict_types = 1);
4 4
 
5 5
 namespace Doctrine\Tests\ORM\Mapping;
6 6
 
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
     protected function setUp()
22 22
     {
23 23
         parent::setUp();
24
-        $this->resolver  = new DefaultEntityListenerResolver();
24
+        $this->resolver = new DefaultEntityListenerResolver();
25 25
     }
26 26
 
27 27
     public function testResolve()
Please login to merge, or discard this patch.
Doctrine/Tests/ORM/Mapping/NamingStrategy/JoinColumnClassNamingStrategy.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-declare(strict_types=1);
3
+declare(strict_types = 1);
4 4
 
5 5
 namespace Doctrine\Tests\ORM\Mapping\NamingStrategy;
6 6
 
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
     public function joinColumnName($propertyName, $className = null)
18 18
     {
19 19
         return strtolower($this->classToTableName($className))
20
-            . '_' . $propertyName
21
-            . '_' . $this->referenceColumnName();
20
+            . '_'.$propertyName
21
+            . '_'.$this->referenceColumnName();
22 22
     }
23 23
 }
Please login to merge, or discard this patch.
tests/Doctrine/Tests/ORM/Mapping/Symfony/AbstractDriverTest.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-declare(strict_types=1);
3
+declare(strict_types = 1);
4 4
 
5 5
 namespace Doctrine\Tests\ORM\Mapping\Symfony;
6 6
 
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
     public function testFindMappingNamespaceNotFound()
55 55
     {
56 56
         $this->expectException(MappingException::class);
57
-        $this->expectExceptionMessage("No mapping file found named 'Foo" . $this->getFileExtension() . "' for class 'MyOtherNamespace\MySubnamespace\Entity\Foo'.");
57
+        $this->expectExceptionMessage("No mapping file found named 'Foo".$this->getFileExtension()."' for class 'MyOtherNamespace\MySubnamespace\Entity\Foo'.");
58 58
 
59 59
         $driver = $this->getDriver(
60 60
             [
Please login to merge, or discard this patch.
tests/Doctrine/Tests/ORM/Mapping/Symfony/XmlDriverTest.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-declare(strict_types=1);
3
+declare(strict_types = 1);
4 4
 
5 5
 namespace Doctrine\Tests\ORM\Mapping\Symfony;
6 6
 
Please login to merge, or discard this patch.
tests/Doctrine/Tests/ORM/Entity/ConstructorTest.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-declare(strict_types=1);
3
+declare(strict_types = 1);
4 4
 
5 5
 namespace Doctrine\Tests\ORM\Entity;
6 6
 
Please login to merge, or discard this patch.
tests/Doctrine/Tests/ORM/Repository/DefaultRepositoryFactoryTest.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-declare(strict_types=1);
3
+declare(strict_types = 1);
4 4
 
5 5
 namespace Doctrine\Tests\ORM\Repository;
6 6
 
Please login to merge, or discard this patch.
tests/Doctrine/Tests/ORM/Sequencing/SequenceGeneratorTest.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-declare(strict_types=1);
3
+declare(strict_types = 1);
4 4
 
5 5
 namespace Doctrine\Tests\ORM\Sequencing;
6 6
 
@@ -45,13 +45,13 @@  discard block
 block discarded – undo
45 45
 
46 46
         for ($i = 0; $i < 42; ++$i) {
47 47
             if ($i % 10 === 0) {
48
-                $this->connection->setQueryResult(new StatementArrayMock([[(int)($i / 10) * 10]]));
48
+                $this->connection->setQueryResult(new StatementArrayMock([[(int) ($i / 10) * 10]]));
49 49
             }
50 50
 
51 51
             $id = $this->sequenceGenerator->generate($this->entityManager, null);
52 52
 
53 53
             self::assertSame($i, $id);
54
-            self::assertSame((int)($i / 10) * 10 + 10, $this->sequenceGenerator->getCurrentMaxValue());
54
+            self::assertSame((int) ($i / 10) * 10 + 10, $this->sequenceGenerator->getCurrentMaxValue());
55 55
             self::assertSame($i + 1, $this->sequenceGenerator->getNextValue());
56 56
         }
57 57
     }
Please login to merge, or discard this patch.