Completed
Pull Request — 2.6 (#8015)
by
unknown
06:46
created
Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC5934.DDC5934BaseContract.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -3,10 +3,10 @@
 block discarded – undo
3 3
 use Doctrine\ORM\Mapping\ClassMetadata;
4 4
 
5 5
 $metadata->mapField([
6
-   'id'         => true,
7
-   'fieldName'  => 'id',
8
-   'type'       => 'integer',
9
-   'columnName' => 'id',
6
+    'id'         => true,
7
+    'fieldName'  => 'id',
8
+    'type'       => 'integer',
9
+    'columnName' => 'id',
10 10
 ]);
11 11
 
12 12
 $metadata->mapManyToMany([
Please login to merge, or discard this patch.
Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC869.DDC869ChequePayment.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@
 block discarded – undo
1 1
 <?php
2 2
 $metadata->mapField(
3 3
     [
4
-   'fieldName'  => 'serialNumber',
5
-   'type'       => 'string',
4
+    'fieldName'  => 'serialNumber',
5
+    'type'       => 'string',
6 6
     ]
7 7
 );
Please login to merge, or discard this patch.
php/Doctrine.Tests.Models.DDC1476.DDC1476EntityWithDefaultFieldType.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -4,13 +4,13 @@
 block discarded – undo
4 4
 
5 5
 $metadata->mapField(
6 6
     [
7
-   'id'         => true,
8
-   'fieldName'  => 'id',
7
+    'id'         => true,
8
+    'fieldName'  => 'id',
9 9
     ]
10 10
 );
11 11
 $metadata->mapField(
12 12
     [
13
-   'fieldName'  => 'name'
13
+    'fieldName'  => 'name'
14 14
     ]
15 15
 );
16 16
 $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_NONE);
Please login to merge, or discard this patch.
Tests/ORM/Mapping/php/Doctrine.Tests.Models.Company.CompanyPerson.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -4,7 +4,7 @@  discard block
 block discarded – undo
4 4
 
5 5
 $metadata->setPrimaryTable(
6 6
     [
7
-   'name' => 'company_person',
7
+    'name' => 'company_person',
8 8
     ]
9 9
 );
10 10
 
@@ -31,14 +31,14 @@  discard block
 block discarded – undo
31 31
     'entities'  => [
32 32
         [
33 33
         'fields' => [
34
-          [
34
+            [
35 35
             'name'      => 'id',
36 36
             'column'    => 'id',
37
-          ],
38
-          [
37
+            ],
38
+            [
39 39
             'name'      => 'name',
40 40
             'column'    => 'name',
41
-          ],
41
+            ],
42 42
         ],
43 43
         'entityClass' => CompanyPerson::class,
44 44
         'discriminatorColumn' => 'discriminator',
Please login to merge, or discard this patch.
Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC889.DDC889SuperClass.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -5,8 +5,8 @@
 block discarded – undo
5 5
 
6 6
 $metadata->mapField(
7 7
     [
8
-   'fieldName'  => 'name',
9
-   'type'       => 'string',
8
+    'fieldName'  => 'name',
9
+    'type'       => 'string',
10 10
     ]
11 11
 );
12 12
 $metadata->isMappedSuperclass = true;
Please login to merge, or discard this patch.
tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.User.php 1 patch
Indentation   +66 added lines, -66 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 $metadata->setInheritanceType(ClassMetadataInfo::INHERITANCE_TYPE_NONE);
9 9
 $metadata->setPrimaryTable(
10 10
     [
11
-   'name' => 'cms_users',
11
+    'name' => 'cms_users',
12 12
     ]
13 13
 );
14 14
 $metadata->setChangeTrackingPolicy(ClassMetadataInfo::CHANGETRACKING_DEFERRED_IMPLICIT);
@@ -23,30 +23,30 @@  discard block
 block discarded – undo
23 23
 );
24 24
 $metadata->mapField(
25 25
     [
26
-   'id' => true,
27
-   'fieldName' => 'id',
28
-   'type' => 'integer',
29
-   'columnName' => 'id',
30
-   'options' => ['foo' => 'bar', 'unsigned' => false],
26
+    'id' => true,
27
+    'fieldName' => 'id',
28
+    'type' => 'integer',
29
+    'columnName' => 'id',
30
+    'options' => ['foo' => 'bar', 'unsigned' => false],
31 31
     ]
32 32
 );
33 33
 $metadata->mapField(
34 34
     [
35
-   'fieldName' => 'name',
36
-   'type' => 'string',
37
-   'length' => 50,
38
-   'unique' => true,
39
-   'nullable' => true,
40
-   'columnName' => 'name',
41
-   'options' => ['foo' => 'bar', 'baz' => ['key' => 'val'], 'fixed' => false],
35
+    'fieldName' => 'name',
36
+    'type' => 'string',
37
+    'length' => 50,
38
+    'unique' => true,
39
+    'nullable' => true,
40
+    'columnName' => 'name',
41
+    'options' => ['foo' => 'bar', 'baz' => ['key' => 'val'], 'fixed' => false],
42 42
     ]
43 43
 );
44 44
 $metadata->mapField(
45 45
     [
46
-   'fieldName' => 'email',
47
-   'type' => 'string',
48
-   'columnName' => 'user_email',
49
-   'columnDefinition' => 'CHAR(32) NOT NULL',
46
+    'fieldName' => 'email',
47
+    'type' => 'string',
48
+    'columnName' => 'user_email',
49
+    'columnDefinition' => 'CHAR(32) NOT NULL',
50 50
     ]
51 51
 );
52 52
 $mapping = ['fieldName' => 'version', 'type' => 'integer'];
@@ -55,60 +55,60 @@  discard block
 block discarded – undo
55 55
 $metadata->setIdGeneratorType(ClassMetadataInfo::GENERATOR_TYPE_AUTO);
56 56
 $metadata->mapOneToOne(
57 57
     [
58
-   'fieldName' => 'address',
59
-   'targetEntity' => Address::class,
60
-   'cascade' =>
61
-   [
62
-   0 => 'remove',
63
-   ],
64
-   'mappedBy' => NULL,
65
-   'inversedBy' => 'user',
66
-   'joinColumns' =>
67
-   [
68
-   0 =>
69
-   [
58
+    'fieldName' => 'address',
59
+    'targetEntity' => Address::class,
60
+    'cascade' =>
61
+    [
62
+    0 => 'remove',
63
+    ],
64
+    'mappedBy' => NULL,
65
+    'inversedBy' => 'user',
66
+    'joinColumns' =>
67
+    [
68
+    0 =>
69
+    [
70 70
     'name' => 'address_id',
71 71
     'referencedColumnName' => 'id',
72 72
     'onDelete' => 'CASCADE',
73
-   ],
74
-   ],
75
-   'orphanRemoval' => false,
73
+    ],
74
+    ],
75
+    'orphanRemoval' => false,
76 76
     ]
77 77
 );
78 78
 $metadata->mapOneToMany(
79 79
     [
80
-   'fieldName' => 'phonenumbers',
81
-   'targetEntity' => Phonenumber::class,
82
-   'cascade' =>
83
-   [
84
-   1 => 'persist',
85
-   ],
86
-   'mappedBy' => 'user',
87
-   'orphanRemoval' => true,
88
-   'orderBy' =>
89
-   [
90
-   'number' => 'ASC',
91
-   ],
80
+    'fieldName' => 'phonenumbers',
81
+    'targetEntity' => Phonenumber::class,
82
+    'cascade' =>
83
+    [
84
+    1 => 'persist',
85
+    ],
86
+    'mappedBy' => 'user',
87
+    'orphanRemoval' => true,
88
+    'orderBy' =>
89
+    [
90
+    'number' => 'ASC',
91
+    ],
92 92
     ]
93 93
 );
94 94
 $metadata->mapManyToMany(
95 95
     [
96
-   'fieldName' => 'groups',
97
-   'targetEntity' => Group::class,
98
-   'cascade' =>
99
-   [
100
-   0 => 'remove',
101
-   1 => 'persist',
102
-   2 => 'refresh',
103
-   3 => 'merge',
104
-   4 => 'detach',
105
-   ],
106
-   'mappedBy' => NULL,
107
-   'joinTable' =>
108
-   [
109
-   'name' => 'cms_users_groups',
110
-   'joinColumns' =>
111
-   [
96
+    'fieldName' => 'groups',
97
+    'targetEntity' => Group::class,
98
+    'cascade' =>
99
+    [
100
+    0 => 'remove',
101
+    1 => 'persist',
102
+    2 => 'refresh',
103
+    3 => 'merge',
104
+    4 => 'detach',
105
+    ],
106
+    'mappedBy' => NULL,
107
+    'joinTable' =>
108
+    [
109
+    'name' => 'cms_users_groups',
110
+    'joinColumns' =>
111
+    [
112 112
     0 =>
113 113
     [
114 114
     'name' => 'user_id',
@@ -116,18 +116,18 @@  discard block
 block discarded – undo
116 116
     'unique' => false,
117 117
     'nullable' => false,
118 118
     ],
119
-   ],
120
-   'inverseJoinColumns' =>
121
-   [
119
+    ],
120
+    'inverseJoinColumns' =>
121
+    [
122 122
     0 =>
123 123
     [
124 124
     'name' => 'group_id',
125 125
     'referencedColumnName' => 'id',
126 126
     'columnDefinition' => 'INT NULL',
127 127
     ],
128
-   ],
129
-   ],
130
-   'orderBy' => NULL,
128
+    ],
129
+    ],
130
+    'orderBy' => NULL,
131 131
     ]
132 132
 );
133 133
 $metadata->table['options'] = [
Please login to merge, or discard this patch.
tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.CMS.CmsUser.php 1 patch
Indentation   +33 added lines, -33 removed lines patch added patch discarded remove 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
 );
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
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
 
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
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'   => [
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
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);
Please login to merge, or discard this patch.