Inspection of "Add deprecation warnings for 2.7.x" - doctrine/orm - Measure and Improve Code Quality continuously with Scrutinizer

Failed Conditions

Pull Request — 2.7 (#7901)

by Luís

created 2019-11-15 13:43 UTC

Status

Indentation +33 added lines, -33 removed lines patch added patch discarded remove patch

@@ -5,7 +5,7 @@  discard block
 block discarded – undo
 
 $metadata->setPrimaryTable(
     [
-   'name' => 'cms_users',
+    'name' => 'cms_users',
     ]
 );
 
@@ -64,34 +64,34 @@  discard block
 block discarded – undo
     'entities'  => [
         [
         'fields'=> [
-          [
+            [
             'name'      => 'id',
             'column'    => 'id',
-          ],
-          [
+            ],
+            [
             'name'      => 'name',
             'column'    => 'name',
-          ],
-          [
+            ],
+            [
             'name'      => 'status',
             'column'    => 'status',
-          ],
-          [
+            ],
+            [
             'name'      => 'address.zip',
             'column'    => 'zip',
-          ],
-          [
+            ],
+            [
             'name'      => 'address.city',
             'column'    => 'city',
-          ],
-          [
+            ],
+            [
             'name'      => 'address.country',
             'column'    => 'country',
-          ],
-          [
+            ],
+            [
             'name'      => 'address.id',
             'column'    => 'a_id',
-          ],
+            ],
         ],
         'entityClass'           => CmsUser::class,
         'discriminatorColumn'   => null
@@ -107,22 +107,22 @@  discard block
 block discarded – undo
     'entities'  => [
         [
         'fields'=> [
-          [
+            [
             'name'      => 'id',
             'column'    => 'id',
-          ],
-          [
+            ],
+            [
             'name'      => 'name',
             'column'    => 'name',
-          ],
-          [
+            ],
+            [
             'name'      => 'status',
             'column'    => 'status',
-          ],
-          [
+            ],
+            [
             'name'      => 'phonenumbers.phonenumber',
             'column'    => 'number',
-          ],
+            ],
         ],
         'entityClass'   => CmsUser::class,
         'discriminatorColumn'   => null
@@ -136,29 +136,29 @@  discard block
 block discarded – undo
     'name'      => 'mappingUserPhonenumberCount',
     'columns'   => [],
     'entities'  => [
-      [
+        [
         'fields' => [
-          [
+            [
             'name'      => 'id',
             'column'    => 'id',
-          ],
-          [
+            ],
+            [
             'name'      => 'name',
             'column'    => 'name',
-          ],
-          [
+            ],
+            [
             'name'      => 'status',
             'column'    => 'status',
-          ]
+            ]
         ],
         'entityClass'   => CmsUser::class,
         'discriminatorColumn'   => null
-      ]
+        ]
     ],
     'columns' => [
-          [
+            [
             'name' => 'numphones',
-          ]
+            ]
     ]
     ]
 );

Please login to merge, or discard this patch.

Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC964.DDC964User.php 2 patches

Indentation +15 added lines, -15 removed lines patch added patch discarded remove patch

@@ -4,11 +4,11 @@  discard block
 block discarded – undo
 
 $metadata->mapField(
     [
-   'id'         => true,
-   'fieldName'  => 'id',
-   'type'       => 'integer',
-   'columnName' => 'user_id',
-   'length'     => 150,
+    'id'         => true,
+    'fieldName'  => 'id',
+    'type'       => 'integer',
+    'columnName' => 'user_id',
+    'length'     => 150,
     ]
 );
 $metadata->mapField(
@@ -24,20 +24,20 @@  discard block
 block discarded – undo
 
 $metadata->mapManyToOne(
     [
-   'fieldName'      => 'address',
-   'targetEntity'   => 'DDC964Address',
-   'cascade'        => ['persist','merge'],
-   'joinColumn'     => ['name'=>'address_id', 'referencedColumnMame'=>'id'],
+    'fieldName'      => 'address',
+    'targetEntity'   => 'DDC964Address',
+    'cascade'        => ['persist','merge'],
+    'joinColumn'     => ['name'=>'address_id', 'referencedColumnMame'=>'id'],
     ]
 );
 
 $metadata->mapManyToMany(
     [
-   'fieldName'      => 'groups',
-   'targetEntity'   => 'DDC964Group',
-   'inversedBy'     => 'users',
-   'cascade'        => ['persist','merge','detach'],
-   'joinTable'      => [
+    'fieldName'      => 'groups',
+    'targetEntity'   => 'DDC964Group',
+    'inversedBy'     => 'users',
+    'cascade'        => ['persist','merge','detach'],
+    'joinTable'      => [
         'name'          => 'ddc964_users_groups',
         'joinColumns'   => [
             [
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
             'referencedColumnName'=>'id',
             ]
         ]
-   ]
+    ]
     ]
 );
 

Please login to merge, or discard this patch.

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -26,7 +26,7 @@  discard block
 block discarded – undo
     [
    'fieldName'      => 'address',
    'targetEntity'   => 'DDC964Address',
-   'cascade'        => ['persist','merge'],
+   'cascade'        => ['persist', 'merge'],
    'joinColumn'     => ['name'=>'address_id', 'referencedColumnMame'=>'id'],
     ]
 );
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
    'fieldName'      => 'groups',
    'targetEntity'   => 'DDC964Group',
    'inversedBy'     => 'users',
-   'cascade'        => ['persist','merge','detach'],
+   'cascade'        => ['persist', 'merge', 'detach'],
    'joinTable'      => [
         'name'          => 'ddc964_users_groups',
         'joinColumns'   => [

Please login to merge, or discard this patch.

tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.Animal.php 1 patch

Indentation +15 added lines, -15 removed lines patch added patch discarded remove patch

@@ -8,30 +8,30 @@
 block discarded – undo
 $metadata->setInheritanceType(ClassMetadataInfo::INHERITANCE_TYPE_SINGLE_TABLE);
 $metadata->setDiscriminatorColumn(
     [
-   'name' => 'dtype',
-   'type' => 'string',
-   'length' => 255,
-   'fieldName' => 'dtype',
+    'name' => 'dtype',
+    'type' => 'string',
+    'length' => 255,
+    'fieldName' => 'dtype',
     ]
 );
 $metadata->setDiscriminatorMap(
     [
-   'cat' => Cat::class,
-   'dog' => Dog::class,
+    'cat' => Cat::class,
+    'dog' => Dog::class,
     ]
 );
 $metadata->setChangeTrackingPolicy(ClassMetadataInfo::CHANGETRACKING_DEFERRED_IMPLICIT);
 $metadata->mapField(
     [
-   'fieldName' => 'id',
-   'type' => 'string',
-   'length' => NULL,
-   'precision' => 0,
-   'scale' => 0,
-   'nullable' => false,
-   'unique' => false,
-   'id' => true,
-   'columnName' => 'id',
+    'fieldName' => 'id',
+    'type' => 'string',
+    'length' => NULL,
+    'precision' => 0,
+    'scale' => 0,
+    'nullable' => false,
+    'unique' => false,
+    'id' => true,
+    'columnName' => 'id',
     ]
 );
 $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_CUSTOM);

Please login to merge, or discard this patch.

tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.Comment.php 1 patch

Indentation +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -5,9 +5,9 @@
 block discarded – undo
 $metadata->setInheritanceType(ClassMetadataInfo::INHERITANCE_TYPE_NONE);
 $metadata->setPrimaryTable(
     [
-   'indexes' => [
-       ['columns' => ['content'], 'flags' => ['fulltext'], 'options'=> ['where' => 'content IS NOT NULL']]
-   ]
+    'indexes' => [
+        ['columns' => ['content'], 'flags' => ['fulltext'], 'options'=> ['where' => 'content IS NOT NULL']]
+    ]
     ]
 );
 

Please login to merge, or discard this patch.

Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC3579.DDC3579User.php 1 patch

Indentation +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -4,11 +4,11 @@  discard block
 block discarded – undo
 
 $metadata->mapField(
     [
-   'id'         => true,
-   'fieldName'  => 'id',
-   'type'       => 'integer',
-   'columnName' => 'user_id',
-   'length'     => 150,
+    'id'         => true,
+    'fieldName'  => 'id',
+    'type'       => 'integer',
+    'columnName' => 'user_id',
+    'length'     => 150,
     ]
 );
 
@@ -25,8 +25,8 @@  discard block
 block discarded – undo
 
 $metadata->mapManyToMany(
     [
-   'fieldName'      => 'groups',
-   'targetEntity'   => 'DDC3579Group'
+    'fieldName'      => 'groups',
+    'targetEntity'   => 'DDC3579Group'
     ]
 );
 

Please login to merge, or discard this patch.

tests/Doctrine/Tests/ORM/Mapping/ClassMetadataBuilderTest.php 1 patch

Indentation +49 added lines, -49 removed lines patch added patch discarded remove patch

@@ -266,10 +266,10 @@  discard block
 block discarded – undo
     {
         $this->assertIsFluent(
             $this->builder->createManyToOne('groups', CmsGroup::class)
-                              ->addJoinColumn('group_id', 'id', true, false, 'CASCADE')
-                              ->cascadeAll()
-                              ->fetchExtraLazy()
-                              ->build()
+                                ->addJoinColumn('group_id', 'id', true, false, 'CASCADE')
+                                ->cascadeAll()
+                                ->fetchExtraLazy()
+                                ->build()
         );
 
         $this->assertEquals(
@@ -278,23 +278,23 @@  discard block
 block discarded – undo
                 'fieldName' => 'groups',
                 'targetEntity' => CmsGroup::class,
                 'cascade' => [
-                  0 => 'remove',
-                  1 => 'persist',
-                  2 => 'refresh',
-                  3 => 'merge',
-                  4 => 'detach',
+                    0 => 'remove',
+                    1 => 'persist',
+                    2 => 'refresh',
+                    3 => 'merge',
+                    4 => 'detach',
                 ],
                 'fetch' => 4,
                 'joinColumns' => [
-                  0 =>
-                  [
+                    0 =>
+                    [
                     'name' => 'group_id',
                     'referencedColumnName' => 'id',
                     'nullable' => true,
                     'unique' => false,
                     'onDelete' => 'CASCADE',
                     'columnDefinition' => NULL,
-                  ],
+                    ],
                 ],
                 'type' => 2,
                 'mappedBy' => NULL,
@@ -308,15 +308,15 @@  discard block
 block discarded – undo
                 'isCascadeDetach' => true,
                 'sourceToTargetKeyColumns' =>
                 [
-                  'group_id' => 'id',
+                    'group_id' => 'id',
                 ],
                 'joinColumnFieldNames' =>
                 [
-                  'group_id' => 'group_id',
+                    'group_id' => 'group_id',
                 ],
                 'targetToSourceKeyColumns' =>
                 [
-                  'id' => 'group_id',
+                    'id' => 'group_id',
                 ],
                 'orphanRemoval' => false,
                 ],
@@ -394,10 +394,10 @@  discard block
 block discarded – undo
     {
         $this->assertIsFluent(
             $this->builder->createOneToOne('groups', CmsGroup::class)
-                              ->addJoinColumn('group_id', 'id', true, false, 'CASCADE')
-                              ->cascadeAll()
-                              ->fetchExtraLazy()
-                              ->build()
+                                ->addJoinColumn('group_id', 'id', true, false, 'CASCADE')
+                                ->cascadeAll()
+                                ->fetchExtraLazy()
+                                ->build()
         );
 
         $this->assertEquals(
@@ -406,23 +406,23 @@  discard block
 block discarded – undo
                 'fieldName' => 'groups',
                 'targetEntity' => CmsGroup::class,
                 'cascade' => [
-                  0 => 'remove',
-                  1 => 'persist',
-                  2 => 'refresh',
-                  3 => 'merge',
-                  4 => 'detach',
+                    0 => 'remove',
+                    1 => 'persist',
+                    2 => 'refresh',
+                    3 => 'merge',
+                    4 => 'detach',
                 ],
                 'fetch' => 4,
                 'joinColumns' => [
-                  0 =>
-                  [
+                    0 =>
+                    [
                     'name' => 'group_id',
                     'referencedColumnName' => 'id',
                     'nullable' => true,
                     'unique' => true,
                     'onDelete' => 'CASCADE',
                     'columnDefinition' => NULL,
-                  ],
+                    ],
                 ],
                 'type' => 1,
                 'mappedBy' => NULL,
@@ -436,15 +436,15 @@  discard block
 block discarded – undo
                 'isCascadeDetach' => true,
                 'sourceToTargetKeyColumns' =>
                 [
-                  'group_id' => 'id',
+                    'group_id' => 'id',
                 ],
                 'joinColumnFieldNames' =>
                 [
-                  'group_id' => 'group_id',
+                    'group_id' => 'group_id',
                 ],
                 'targetToSourceKeyColumns' =>
                 [
-                  'id' => 'group_id',
+                    'id' => 'group_id',
                 ],
                 'orphanRemoval' => false
                 ],
@@ -535,12 +535,12 @@  discard block
 block discarded – undo
     {
         $this->assertIsFluent(
             $this->builder->createManyToMany('groups', CmsGroup::class)
-                              ->setJoinTable('groups_users')
-                              ->addJoinColumn('group_id', 'id', true, false, 'CASCADE')
-                              ->addInverseJoinColumn('user_id', 'id')
-                              ->cascadeAll()
-                              ->fetchExtraLazy()
-                              ->build()
+                                ->setJoinTable('groups_users')
+                                ->addJoinColumn('group_id', 'id', true, false, 'CASCADE')
+                                ->addInverseJoinColumn('user_id', 'id')
+                                ->cascadeAll()
+                                ->fetchExtraLazy()
+                                ->build()
         );
 
         $this->assertEquals(
@@ -620,13 +620,13 @@  discard block
 block discarded – undo
         $this->expectException(\Doctrine\ORM\Mapping\MappingException::class);
 
         $this->builder->createManyToMany('groups', CmsGroup::class)
-                          ->makePrimaryKey()
-                          ->setJoinTable('groups_users')
-                          ->addJoinColumn('group_id', 'id', true, false, 'CASCADE')
-                          ->addInverseJoinColumn('user_id', 'id')
-                          ->cascadeAll()
-                          ->fetchExtraLazy()
-                          ->build();
+                            ->makePrimaryKey()
+                            ->setJoinTable('groups_users')
+                            ->addJoinColumn('group_id', 'id', true, false, 'CASCADE')
+                            ->addInverseJoinColumn('user_id', 'id')
+                            ->cascadeAll()
+                            ->fetchExtraLazy()
+                            ->build();
     }
 
     public function testCreateOneToMany()
@@ -699,15 +699,15 @@  discard block
 block discarded – undo
                 'cascade' => [],
                 'fetch' => 2,
                 'joinColumns' => [
-                  0 =>
-                  [
+                    0 =>
+                    [
                     'name' => 'group_id',
                     'referencedColumnName' => 'id',
                     'nullable' => true,
                     'unique' => true,
                     'onDelete' => 'CASCADE',
                     'columnDefinition' => NULL,
-                  ],
+                    ],
                 ],
                 'type' => 1,
                 'mappedBy' => NULL,
@@ -721,15 +721,15 @@  discard block
 block discarded – undo
                 'isCascadeDetach' => false,
                 'sourceToTargetKeyColumns' =>
                 [
-                  'group_id' => 'id',
+                    'group_id' => 'id',
                 ],
                 'joinColumnFieldNames' =>
                 [
-                  'group_id' => 'group_id',
+                    'group_id' => 'group_id',
                 ],
                 'targetToSourceKeyColumns' =>
                 [
-                  'id' => 'group_id',
+                    'id' => 'group_id',
                 ],
                 'orphanRemoval' => true
             ],

Please login to merge, or discard this patch.

Doctrine/Tests/ORM/Mapping/Reflection/ReflectionPropertiesGetterTest.php 1 patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -45,15 +45,15 @@
 block discarded – undo
             ->getProperties(ClassWithMixedProperties::class);
 
         $this->assertArrayHasKey(
-            "\0" . ClassWithMixedProperties::class . "\0" . 'privateProperty',
+            "\0".ClassWithMixedProperties::class."\0".'privateProperty',
             $properties
         );
         $this->assertArrayHasKey(
-            "\0" . ClassWithMixedProperties::class . "\0" . 'privatePropertyOverride',
+            "\0".ClassWithMixedProperties::class."\0".'privatePropertyOverride',
             $properties
         );
         $this->assertArrayHasKey(
-            "\0" . ParentClass::class . "\0" . 'privatePropertyOverride',
+            "\0".ParentClass::class."\0".'privatePropertyOverride',
             $properties
         );
         $this->assertArrayHasKey(

Please login to merge, or discard this patch.

tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php 1 patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -130,7 +130,7 @@
 block discarded – undo
     {
         $this->expectException(MappingException::class);
         $this->expectExceptionMessage(
-              'Entity \'Doctrine\Tests\ORM\Mapping\HierarchyBEntity\' has to be part of the discriminator map'
+                'Entity \'Doctrine\Tests\ORM\Mapping\HierarchyBEntity\' has to be part of the discriminator map'
             . ' of \'Doctrine\Tests\ORM\Mapping\HierarchyBase\' to be properly mapped in the inheritance hierarchy.'
             . ' Alternatively you can make \'Doctrine\Tests\ORM\Mapping\HierarchyBEntity\' an abstract class to'
             . ' avoid this exception from occurring.'

Please login to merge, or discard this patch.

tests/Doctrine/Tests/ORM/Mapping/EntityListenerResolverTest.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -19,7 +19,7 @@
 block discarded – undo
     protected function setUp()
     {
         parent::setUp();
-        $this->resolver  = new DefaultEntityListenerResolver();
+        $this->resolver = new DefaultEntityListenerResolver();
     }
 
     public function testResolve()

Please login to merge, or discard this patch.

		@@ -5,7 +5,7 @@ discard block
		block discarded – undo
5	5
6	6	$metadata->setPrimaryTable(
7	7	[
8		- 'name' => 'cms_users',
	8	+ 'name' => 'cms_users',
9	9	]
10	10	);
11	11
		@@ -64,34 +64,34 @@ discard block
		block discarded – undo
64	64	'entities' => [
65	65	[
66	66	'fields'=> [
67		- [
	67	+ [
68	68	'name' => 'id',
69	69	'column' => 'id',
70		- ],
71		- [
	70	+ ],
	71	+ [
72	72	'name' => 'name',
73	73	'column' => 'name',
74		- ],
75		- [
	74	+ ],
	75	+ [
76	76	'name' => 'status',
77	77	'column' => 'status',
78		- ],
79		- [
	78	+ ],
	79	+ [
80	80	'name' => 'address.zip',
81	81	'column' => 'zip',
82		- ],
83		- [
	82	+ ],
	83	+ [
84	84	'name' => 'address.city',
85	85	'column' => 'city',
86		- ],
87		- [
	86	+ ],
	87	+ [
88	88	'name' => 'address.country',
89	89	'column' => 'country',
90		- ],
91		- [
	90	+ ],
	91	+ [
92	92	'name' => 'address.id',
93	93	'column' => 'a_id',
94		- ],
	94	+ ],
95	95	],
96	96	'entityClass' => CmsUser::class,
97	97	'discriminatorColumn' => null
		@@ -107,22 +107,22 @@ discard block
		block discarded – undo
107	107	'entities' => [
108	108	[
109	109	'fields'=> [
110		- [
	110	+ [
111	111	'name' => 'id',
112	112	'column' => 'id',
113		- ],
114		- [
	113	+ ],
	114	+ [
115	115	'name' => 'name',
116	116	'column' => 'name',
117		- ],
118		- [
	117	+ ],
	118	+ [
119	119	'name' => 'status',
120	120	'column' => 'status',
121		- ],
122		- [
	121	+ ],
	122	+ [
123	123	'name' => 'phonenumbers.phonenumber',
124	124	'column' => 'number',
125		- ],
	125	+ ],
126	126	],
127	127	'entityClass' => CmsUser::class,
128	128	'discriminatorColumn' => null
		@@ -136,29 +136,29 @@ discard block
		block discarded – undo
136	136	'name' => 'mappingUserPhonenumberCount',
137	137	'columns' => [],
138	138	'entities' => [
139		- [
	139	+ [
140	140	'fields' => [
141		- [
	141	+ [
142	142	'name' => 'id',
143	143	'column' => 'id',
144		- ],
145		- [
	144	+ ],
	145	+ [
146	146	'name' => 'name',
147	147	'column' => 'name',
148		- ],
149		- [
	148	+ ],
	149	+ [
150	150	'name' => 'status',
151	151	'column' => 'status',
152		- ]
	152	+ ]
153	153	],
154	154	'entityClass' => CmsUser::class,
155	155	'discriminatorColumn' => null
156		- ]
	156	+ ]
157	157	],
158	158	'columns' => [
159		- [
	159	+ [
160	160	'name' => 'numphones',
161		- ]
	161	+ ]
162	162	]
163	163	]
164	164	);

		@@ -4,11 +4,11 @@ discard block
		block discarded – undo
4	4
5	5	$metadata->mapField(
6	6	[
7		- 'id' => true,
8		- 'fieldName' => 'id',
9		- 'type' => 'integer',
10		- 'columnName' => 'user_id',
11		- 'length' => 150,
	7	+ 'id' => true,
	8	+ 'fieldName' => 'id',
	9	+ 'type' => 'integer',
	10	+ 'columnName' => 'user_id',
	11	+ 'length' => 150,
12	12	]
13	13	);
14	14	$metadata->mapField(
		@@ -24,20 +24,20 @@ discard block
		block discarded – undo
24	24
25	25	$metadata->mapManyToOne(
26	26	[
27		- 'fieldName' => 'address',
28		- 'targetEntity' => 'DDC964Address',
29		- 'cascade' => ['persist','merge'],
30		- 'joinColumn' => ['name'=>'address_id', 'referencedColumnMame'=>'id'],
	27	+ 'fieldName' => 'address',
	28	+ 'targetEntity' => 'DDC964Address',
	29	+ 'cascade' => ['persist','merge'],
	30	+ 'joinColumn' => ['name'=>'address_id', 'referencedColumnMame'=>'id'],
31	31	]
32	32	);
33	33
34	34	$metadata->mapManyToMany(
35	35	[
36		- 'fieldName' => 'groups',
37		- 'targetEntity' => 'DDC964Group',
38		- 'inversedBy' => 'users',
39		- 'cascade' => ['persist','merge','detach'],
40		- 'joinTable' => [
	36	+ 'fieldName' => 'groups',
	37	+ 'targetEntity' => 'DDC964Group',
	38	+ 'inversedBy' => 'users',
	39	+ 'cascade' => ['persist','merge','detach'],
	40	+ 'joinTable' => [
41	41	'name' => 'ddc964_users_groups',
42	42	'joinColumns' => [
43	43	[
		@@ -51,7 +51,7 @@ discard block
		block discarded – undo
51	51	'referencedColumnName'=>'id',
52	52	]
53	53	]
54		- ]
	54	+ ]
55	55	]
56	56	);
57	57

		@@ -26,7 +26,7 @@ discard block
		block discarded – undo
26	26	[
27	27	'fieldName' => 'address',
28	28	'targetEntity' => 'DDC964Address',
29		- 'cascade' => ['persist','merge'],
	29	+ 'cascade' => ['persist', 'merge'],
30	30	'joinColumn' => ['name'=>'address_id', 'referencedColumnMame'=>'id'],
31	31	]
32	32	);
		@@ -36,7 +36,7 @@ discard block
		block discarded – undo
36	36	'fieldName' => 'groups',
37	37	'targetEntity' => 'DDC964Group',
38	38	'inversedBy' => 'users',
39		- 'cascade' => ['persist','merge','detach'],
	39	+ 'cascade' => ['persist', 'merge', 'detach'],
40	40	'joinTable' => [
41	41	'name' => 'ddc964_users_groups',
42	42	'joinColumns' => [

		@@ -8,30 +8,30 @@
		block discarded – undo
8	8	$metadata->setInheritanceType(ClassMetadataInfo::INHERITANCE_TYPE_SINGLE_TABLE);
9	9	$metadata->setDiscriminatorColumn(
10	10	[
11		- 'name' => 'dtype',
12		- 'type' => 'string',
13		- 'length' => 255,
14		- 'fieldName' => 'dtype',
	11	+ 'name' => 'dtype',
	12	+ 'type' => 'string',
	13	+ 'length' => 255,
	14	+ 'fieldName' => 'dtype',
15	15	]
16	16	);
17	17	$metadata->setDiscriminatorMap(
18	18	[
19		- 'cat' => Cat::class,
20		- 'dog' => Dog::class,
	19	+ 'cat' => Cat::class,
	20	+ 'dog' => Dog::class,
21	21	]
22	22	);
23	23	$metadata->setChangeTrackingPolicy(ClassMetadataInfo::CHANGETRACKING_DEFERRED_IMPLICIT);
24	24	$metadata->mapField(
25	25	[
26		- 'fieldName' => 'id',
27		- 'type' => 'string',
28		- 'length' => NULL,
29		- 'precision' => 0,
30		- 'scale' => 0,
31		- 'nullable' => false,
32		- 'unique' => false,
33		- 'id' => true,
34		- 'columnName' => 'id',
	26	+ 'fieldName' => 'id',
	27	+ 'type' => 'string',
	28	+ 'length' => NULL,
	29	+ 'precision' => 0,
	30	+ 'scale' => 0,
	31	+ 'nullable' => false,
	32	+ 'unique' => false,
	33	+ 'id' => true,
	34	+ 'columnName' => 'id',
35	35	]
36	36	);
37	37	$metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_CUSTOM);

		@@ -5,9 +5,9 @@
		block discarded – undo
5	5	$metadata->setInheritanceType(ClassMetadataInfo::INHERITANCE_TYPE_NONE);
6	6	$metadata->setPrimaryTable(
7	7	[
8		- 'indexes' => [
9		- ['columns' => ['content'], 'flags' => ['fulltext'], 'options'=> ['where' => 'content IS NOT NULL']]
10		- ]
	8	+ 'indexes' => [
	9	+ ['columns' => ['content'], 'flags' => ['fulltext'], 'options'=> ['where' => 'content IS NOT NULL']]
	10	+ ]
11	11	]
12	12	);
13	13

		@@ -266,10 +266,10 @@ discard block
		block discarded – undo
266	266	{
267	267	$this->assertIsFluent(
268	268	$this->builder->createManyToOne('groups', CmsGroup::class)
269		- ->addJoinColumn('group_id', 'id', true, false, 'CASCADE')
270		- ->cascadeAll()
271		- ->fetchExtraLazy()
272		- ->build()
	269	+ ->addJoinColumn('group_id', 'id', true, false, 'CASCADE')
	270	+ ->cascadeAll()
	271	+ ->fetchExtraLazy()
	272	+ ->build()
273	273	);
274	274
275	275	$this->assertEquals(
		@@ -278,23 +278,23 @@ discard block
		block discarded – undo
278	278	'fieldName' => 'groups',
279	279	'targetEntity' => CmsGroup::class,
280	280	'cascade' => [
281		- 0 => 'remove',
282		- 1 => 'persist',
283		- 2 => 'refresh',
284		- 3 => 'merge',
285		- 4 => 'detach',
	281	+ 0 => 'remove',
	282	+ 1 => 'persist',
	283	+ 2 => 'refresh',
	284	+ 3 => 'merge',
	285	+ 4 => 'detach',
286	286	],
287	287	'fetch' => 4,
288	288	'joinColumns' => [
289		- 0 =>
290		- [
	289	+ 0 =>
	290	+ [
291	291	'name' => 'group_id',
292	292	'referencedColumnName' => 'id',
293	293	'nullable' => true,
294	294	'unique' => false,
295	295	'onDelete' => 'CASCADE',
296	296	'columnDefinition' => NULL,
297		- ],
	297	+ ],
298	298	],
299	299	'type' => 2,
300	300	'mappedBy' => NULL,
		@@ -308,15 +308,15 @@ discard block
		block discarded – undo
308	308	'isCascadeDetach' => true,
309	309	'sourceToTargetKeyColumns' =>
310	310	[
311		- 'group_id' => 'id',
	311	+ 'group_id' => 'id',
312	312	],
313	313	'joinColumnFieldNames' =>
314	314	[
315		- 'group_id' => 'group_id',
	315	+ 'group_id' => 'group_id',
316	316	],
317	317	'targetToSourceKeyColumns' =>
318	318	[
319		- 'id' => 'group_id',
	319	+ 'id' => 'group_id',
320	320	],
321	321	'orphanRemoval' => false,
322	322	],
		@@ -394,10 +394,10 @@ discard block
		block discarded – undo
394	394	{
395	395	$this->assertIsFluent(
396	396	$this->builder->createOneToOne('groups', CmsGroup::class)
397		- ->addJoinColumn('group_id', 'id', true, false, 'CASCADE')
398		- ->cascadeAll()
399		- ->fetchExtraLazy()
400		- ->build()
	397	+ ->addJoinColumn('group_id', 'id', true, false, 'CASCADE')
	398	+ ->cascadeAll()
	399	+ ->fetchExtraLazy()
	400	+ ->build()
401	401	);
402	402
403	403	$this->assertEquals(
		@@ -406,23 +406,23 @@ discard block
		block discarded – undo
406	406	'fieldName' => 'groups',
407	407	'targetEntity' => CmsGroup::class,
408	408	'cascade' => [
409		- 0 => 'remove',
410		- 1 => 'persist',
411		- 2 => 'refresh',
412		- 3 => 'merge',
413		- 4 => 'detach',
	409	+ 0 => 'remove',
	410	+ 1 => 'persist',
	411	+ 2 => 'refresh',
	412	+ 3 => 'merge',
	413	+ 4 => 'detach',
414	414	],
415	415	'fetch' => 4,
416	416	'joinColumns' => [
417		- 0 =>
418		- [
	417	+ 0 =>
	418	+ [
419	419	'name' => 'group_id',
420	420	'referencedColumnName' => 'id',
421	421	'nullable' => true,
422	422	'unique' => true,
423	423	'onDelete' => 'CASCADE',
424	424	'columnDefinition' => NULL,
425		- ],
	425	+ ],
426	426	],
427	427	'type' => 1,
428	428	'mappedBy' => NULL,
		@@ -436,15 +436,15 @@ discard block
		block discarded – undo
436	436	'isCascadeDetach' => true,
437	437	'sourceToTargetKeyColumns' =>
438	438	[
439		- 'group_id' => 'id',
	439	+ 'group_id' => 'id',
440	440	],
441	441	'joinColumnFieldNames' =>
442	442	[
443		- 'group_id' => 'group_id',
	443	+ 'group_id' => 'group_id',
444	444	],
445	445	'targetToSourceKeyColumns' =>
446	446	[
447		- 'id' => 'group_id',
	447	+ 'id' => 'group_id',
448	448	],
449	449	'orphanRemoval' => false
450	450	],
		@@ -535,12 +535,12 @@ discard block
		block discarded – undo
535	535	{
536	536	$this->assertIsFluent(
537	537	$this->builder->createManyToMany('groups', CmsGroup::class)
538		- ->setJoinTable('groups_users')
539		- ->addJoinColumn('group_id', 'id', true, false, 'CASCADE')
540		- ->addInverseJoinColumn('user_id', 'id')
541		- ->cascadeAll()
542		- ->fetchExtraLazy()
543		- ->build()
	538	+ ->setJoinTable('groups_users')
	539	+ ->addJoinColumn('group_id', 'id', true, false, 'CASCADE')
	540	+ ->addInverseJoinColumn('user_id', 'id')
	541	+ ->cascadeAll()
	542	+ ->fetchExtraLazy()
	543	+ ->build()
544	544	);
545	545
546	546	$this->assertEquals(
		@@ -620,13 +620,13 @@ discard block
		block discarded – undo
620	620	$this->expectException(\Doctrine\ORM\Mapping\MappingException::class);
621	621
622	622	$this->builder->createManyToMany('groups', CmsGroup::class)
623		- ->makePrimaryKey()
624		- ->setJoinTable('groups_users')
625		- ->addJoinColumn('group_id', 'id', true, false, 'CASCADE')
626		- ->addInverseJoinColumn('user_id', 'id')
627		- ->cascadeAll()
628		- ->fetchExtraLazy()
629		- ->build();
	623	+ ->makePrimaryKey()
	624	+ ->setJoinTable('groups_users')
	625	+ ->addJoinColumn('group_id', 'id', true, false, 'CASCADE')
	626	+ ->addInverseJoinColumn('user_id', 'id')
	627	+ ->cascadeAll()
	628	+ ->fetchExtraLazy()
	629	+ ->build();
630	630	}
631	631
632	632	public function testCreateOneToMany()
		@@ -699,15 +699,15 @@ discard block
		block discarded – undo
699	699	'cascade' => [],
700	700	'fetch' => 2,
701	701	'joinColumns' => [
702		- 0 =>
703		- [
	702	+ 0 =>
	703	+ [
704	704	'name' => 'group_id',
705	705	'referencedColumnName' => 'id',
706	706	'nullable' => true,
707	707	'unique' => true,
708	708	'onDelete' => 'CASCADE',
709	709	'columnDefinition' => NULL,
710		- ],
	710	+ ],
711	711	],
712	712	'type' => 1,
713	713	'mappedBy' => NULL,
		@@ -721,15 +721,15 @@ discard block
		block discarded – undo
721	721	'isCascadeDetach' => false,
722	722	'sourceToTargetKeyColumns' =>
723	723	[
724		- 'group_id' => 'id',
	724	+ 'group_id' => 'id',
725	725	],
726	726	'joinColumnFieldNames' =>
727	727	[
728		- 'group_id' => 'group_id',
	728	+ 'group_id' => 'group_id',
729	729	],
730	730	'targetToSourceKeyColumns' =>
731	731	[
732		- 'id' => 'group_id',
	732	+ 'id' => 'group_id',
733	733	],
734	734	'orphanRemoval' => true
735	735	],

		@@ -45,15 +45,15 @@
		block discarded – undo
45	45	->getProperties(ClassWithMixedProperties::class);
46	46
47	47	$this->assertArrayHasKey(
48		- "\0" . ClassWithMixedProperties::class . "\0" . 'privateProperty',
	48	+ "\0".ClassWithMixedProperties::class."\0".'privateProperty',
49	49	$properties
50	50	);
51	51	$this->assertArrayHasKey(
52		- "\0" . ClassWithMixedProperties::class . "\0" . 'privatePropertyOverride',
	52	+ "\0".ClassWithMixedProperties::class."\0".'privatePropertyOverride',
53	53	$properties
54	54	);
55	55	$this->assertArrayHasKey(
56		- "\0" . ParentClass::class . "\0" . 'privatePropertyOverride',
	56	+ "\0".ParentClass::class."\0".'privatePropertyOverride',
57	57	$properties
58	58	);
59	59	$this->assertArrayHasKey(

		@@ -130,7 +130,7 @@
		block discarded – undo
130	130	{
131	131	$this->expectException(MappingException::class);
132	132	$this->expectExceptionMessage(
133		- 'Entity \'Doctrine\Tests\ORM\Mapping\HierarchyBEntity\' has to be part of the discriminator map'
	133	+ 'Entity \'Doctrine\Tests\ORM\Mapping\HierarchyBEntity\' has to be part of the discriminator map'
134	134	. ' of \'Doctrine\Tests\ORM\Mapping\HierarchyBase\' to be properly mapped in the inheritance hierarchy.'
135	135	. ' Alternatively you can make \'Doctrine\Tests\ORM\Mapping\HierarchyBEntity\' an abstract class to'
136	136	. ' avoid this exception from occurring.'

		@@ -19,7 +19,7 @@
		block discarded – undo
19	19	protected function setUp()
20	20	{
21	21	parent::setUp();
22		- $this->resolver = new DefaultEntityListenerResolver();
	22	+ $this->resolver = new DefaultEntityListenerResolver();
23	23	}
24	24
25	25	public function testResolve()

doctrine / orm

Pull Request — 2.7 (#7901)

Status

Category

Indentation +33 added lines, -33 removed lines patch added patch discarded remove patch

Indentation +15 added lines, -15 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +15 added lines, -15 removed lines patch added patch discarded remove patch

Indentation +3 added lines, -3 removed lines patch added patch discarded remove patch

Indentation +7 added lines, -7 removed lines patch added patch discarded remove patch

Indentation +49 added lines, -49 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch