Skip to content

Commit 050e1fc

Browse files
committed
Merge branch '4.4' into 5.3
* 4.4: [CS] Add missing commas
2 parents 7dd93a3 + 93c7e93 commit 050e1fc

File tree

18 files changed

+27
-27
lines changed

18 files changed

+27
-27
lines changed

components/form.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,7 @@ option when building each field:
687687
'constraints' => [
688688
new NotBlank(),
689689
new Type(\DateTime::class),
690-
]
690+
],
691691
])
692692
->getForm();
693693
@@ -714,7 +714,7 @@ option when building each field:
714714
'constraints' => [
715715
new NotBlank(),
716716
new Type(\DateTime::class),
717-
]
717+
],
718718
])
719719
->getForm();
720720
// ...

components/property_access.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ You can also use multi dimensional arrays::
7272
],
7373
[
7474
'first_name' => 'Ryan',
75-
]
75+
],
7676
];
7777

7878
var_dump($propertyAccessor->getValue($persons, '[0][first_name]')); // 'Wouter'

components/var_dumper/advanced.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ method::
200200
$dumper->dump($var, $output, [
201201
// 1 and 160 are the default values for these options
202202
'maxDepth' => 1,
203-
'maxStringLength' => 160
203+
'maxStringLength' => 160,
204204
]);
205205

206206
The output format of a dumper can be fine tuned by the two flags
@@ -223,7 +223,7 @@ next to its content::
223223

224224
$varCloner = new VarCloner();
225225
$var = ['test'];
226-
226+
227227
$dumper = new CliDumper();
228228
echo $dumper->dump($varCloner->cloneVar($var), true);
229229

@@ -248,7 +248,7 @@ similar to PHP's short array notation::
248248

249249
$varCloner = new VarCloner();
250250
$var = ['test'];
251-
251+
252252
$dumper = new CliDumper();
253253
echo $dumper->dump($varCloner->cloneVar($var), true);
254254

@@ -273,7 +273,7 @@ using the logical OR operator ``|``::
273273

274274
$varCloner = new VarCloner();
275275
$var = ['test'];
276-
276+
277277
$dumper = new CliDumper(null, null, AbstractDumper::DUMP_STRING_LENGTH | AbstractDumper::DUMP_LIGHT_ARRAY);
278278
echo $dumper->dump($varCloner->cloneVar($var), true);
279279

components/var_exporter.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,12 +120,12 @@ created by using the special ``"\0"`` property name to define their internal val
120120

121121
// Creates an SplObjectHash where $info1 is associated to $object1, etc.
122122
$theObject = Instantiator::instantiate(SplObjectStorage::class, [
123-
"\0" => [$object1, $info1, $object2, $info2...]
123+
"\0" => [$object1, $info1, $object2, $info2...],
124124
]);
125125

126126
// creates an ArrayObject populated with $inputArray
127127
$theObject = Instantiator::instantiate(ArrayObject::class, [
128-
"\0" => [$inputArray]
128+
"\0" => [$inputArray],
129129
]);
130130

131131
.. _`OPcache`: https://www.php.net/opcache

configuration.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ This example shows how you could configure the database connection using an env
524524
'dbal' => [
525525
// by convention the env var names are always uppercase
526526
'url' => '%env(resolve:DATABASE_URL)%',
527-
]
527+
],
528528
]);
529529
};
530530

create_framework/unit_testing.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ using `PHPUnit`_. Create a PHPUnit configuration file in
2626
<directory suffix=".php">./src</directory>
2727
</include>
2828
</coverage>
29-
29+
3030
<testsuites>
3131
<testsuite name="Test Suite">
3232
<directory>./tests</directory>
@@ -167,7 +167,7 @@ Response::
167167
->will($this->returnValue([
168168
'_route' => 'is_leap_year/{year}',
169169
'year' => '2000',
170-
'_controller' => [new LeapYearController(), 'index']
170+
'_controller' => [new LeapYearController(), 'index'],
171171
]))
172172
;
173173
$matcher

mailer.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ over SMTP by configuring the DSN in your ``.env`` file (the ``user``,
6161
$containerConfigurator->extension('framework', [
6262
'mailer' => [
6363
'dsn' => '%env(MAILER_DSN)%',
64-
]
64+
],
6565
]);
6666
};
6767

mercure.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ Add your JWT secret to the configuration as follow:
400400
'url' => 'https://mercure-hub.example.com/.well-known/mercure',
401401
'jwt' => [
402402
'secret' => '!ChangeMe!',
403-
]
403+
],
404404
],
405405
],
406406
]);
@@ -499,7 +499,7 @@ Then, reference this service in the bundle configuration:
499499
'url' => 'https://mercure-hub.example.com/.well-known/mercure',
500500
'jwt' => [
501501
'provider' => MyJwtProvider::class,
502-
]
502+
],
503503
],
504504
],
505505
]);

reference/configuration/framework.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3428,9 +3428,9 @@ the `SMTP session`_. This value overrides any other recipient set in the code.
34283428
'recipients' => [
34293429
34303430
3431-
]
3432-
]
3433-
]
3431+
],
3432+
],
3433+
],
34343434
]);
34353435
};
34363436

reference/forms/types/birthday.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ values for the year, month and day fields::
101101
$builder->add('birthdate', BirthdayType::class, [
102102
'placeholder' => [
103103
'year' => 'Year', 'month' => 'Month', 'day' => 'Day',
104-
]
104+
],
105105
]);
106106

107107
.. include:: /reference/forms/types/options/date_format.rst.inc

reference/forms/types/date.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ values for the year, month and day fields::
168168
$builder->add('dueDate', DateType::class, [
169169
'placeholder' => [
170170
'year' => 'Year', 'month' => 'Month', 'day' => 'Day',
171-
]
171+
],
172172
]);
173173

174174
.. _reference-forms-type-date-format:

reference/forms/types/dateinterval.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ add a "blank" entry to the top of each select box::
113113
Alternatively, you can specify a string to be displayed for the "blank" value::
114114

115115
$builder->add('remindEvery', DateIntervalType::class, [
116-
'placeholder' => ['years' => 'Years', 'months' => 'Months', 'days' => 'Days']
116+
'placeholder' => ['years' => 'Years', 'months' => 'Months', 'days' => 'Days'],
117117
]);
118118

119119
``hours``

reference/forms/types/datetime.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ values for the year, month, day, hour, minute and second fields::
125125
'placeholder' => [
126126
'year' => 'Year', 'month' => 'Month', 'day' => 'Day',
127127
'hour' => 'Hour', 'minute' => 'Minute', 'second' => 'Second',
128-
]
128+
],
129129
]);
130130

131131
format

reference/forms/types/range.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Basic Usage
5151
'attr' => [
5252
'min' => 5,
5353
'max' => 50
54-
]
54+
],
5555
]);
5656
5757
Overridden Options

reference/forms/types/time.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ values for the hour, minute and second fields::
115115
$builder->add('startTime', 'time', [
116116
'placeholder' => [
117117
'hour' => 'Hour', 'minute' => 'Minute', 'second' => 'Second',
118-
]
118+
],
119119
]);
120120

121121
.. include:: /reference/forms/types/options/hours.rst.inc

reference/forms/types/week.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ values for the year and week fields::
7979
'placeholder' => [
8080
'year' => 'Year',
8181
'week' => 'Week',
82-
]
82+
],
8383
]);
8484

8585
.. include:: /reference/forms/types/options/html5.rst.inc

security/form_login_setup.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ whenever the user browses a page::
504504
public static function getSubscribedEvents(): array
505505
{
506506
return [
507-
KernelEvents::REQUEST => ['onKernelRequest']
507+
KernelEvents::REQUEST => ['onKernelRequest'],
508508
];
509509
}
510510
}

service_container/tags.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ use this, update the compiler::
492492
foreach ($tags as $attributes) {
493493
$definition->addMethodCall('addTransport', [
494494
new Reference($id),
495-
$attributes['alias']
495+
$attributes['alias'],
496496
]);
497497
}
498498
}

0 commit comments

Comments
 (0)