Skip to content

Commit 761d8e1

Browse files
fabpotfabpot
committed
Merge branch '2.8' into 3.0
* 2.8: fixed CS fixed form tests [Console] Fix formatting of SymfonyStyle::comment() [Form] fix post max size translation type extension for >= 2.8 removed dots at the end of @param and @return fixed typo
2 parents a080eda + 2dd85de commit 761d8e1

11 files changed

+47
-47
lines changed

‎Compiler/AnalyzeServiceReferencesPass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ private function processArguments(array $arguments)
120120
/**
121121
* Returns a service definition given the full name or an alias.
122122
*
123-
* @param string $id A full id or alias for a service definition.
123+
* @param string $id A full id or alias for a service definition
124124
*
125125
* @return Definition|null The definition related to the supplied id
126126
*/

‎ContainerBuilder.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ public function get($id, $invalidBehavior = ContainerInterface::EXCEPTION_ON_INV
458458
* parameter, the value will still be 'bar' as defined in the ContainerBuilder
459459
* constructor.
460460
*
461-
* @param ContainerBuilder $container The ContainerBuilder instance to merge.
461+
* @param ContainerBuilder $container The ContainerBuilder instance to merge
462462
*
463463
* @throws BadMethodCallException When this ContainerBuilder is frozen
464464
*/
@@ -944,7 +944,7 @@ public function resolveServices($value)
944944
*
945945
* @param string $name The tag name
946946
*
947-
* @return array An array of tags with the tagged service as key, holding a list of attribute arrays.
947+
* @return array An array of tags with the tagged service as key, holding a list of attribute arrays
948948
*/
949949
public function findTaggedServiceIds($name)
950950
{
@@ -1000,7 +1000,7 @@ public function getExpressionLanguageProviders()
10001000
/**
10011001
* Returns the Service Conditionals.
10021002
*
1003-
* @param mixed $value An array of conditionals to return.
1003+
* @param mixed $value An array of conditionals to return
10041004
*
10051005
* @return array An array of Service conditionals
10061006
*/

‎DefinitionDecorator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class DefinitionDecorator extends Definition
2525
private $changes = array();
2626

2727
/**
28-
* @param string $parent The id of Definition instance to decorate.
28+
* @param string $parent The id of Definition instance to decorate
2929
*/
3030
public function __construct($parent)
3131
{

‎Dumper/PhpDumper.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -566,16 +566,16 @@ private function addService($id, $definition)
566566
if ($definition->isSynthetic()) {
567567
$return[] = '@throws RuntimeException always since this service is expected to be injected dynamically';
568568
} elseif ($class = $definition->getClass()) {
569-
$return[] = sprintf('@return %s A %s instance.', 0 === strpos($class, '%') ? 'object' : '\\'.ltrim($class, '\\'), ltrim($class, '\\'));
569+
$return[] = sprintf('@return %s A %s instance', 0 === strpos($class, '%') ? 'object' : '\\'.ltrim($class, '\\'), ltrim($class, '\\'));
570570
} elseif ($definition->getFactory()) {
571571
$factory = $definition->getFactory();
572572
if (is_string($factory)) {
573-
$return[] = sprintf('@return object An instance returned by %s().', $factory);
573+
$return[] = sprintf('@return object An instance returned by %s()', $factory);
574574
} elseif (is_array($factory) && (is_string($factory[0]) || $factory[0] instanceof Definition || $factory[0] instanceof Reference)) {
575575
if (is_string($factory[0]) || $factory[0] instanceof Reference) {
576-
$return[] = sprintf('@return object An instance returned by %s::%s().', (string) $factory[0], $factory[1]);
576+
$return[] = sprintf('@return object An instance returned by %s::%s()', (string) $factory[0], $factory[1]);
577577
} elseif ($factory[0] instanceof Definition) {
578-
$return[] = sprintf('@return object An instance returned by %s::%s().', $factory[0]->getClass(), $factory[1]);
578+
$return[] = sprintf('@return object An instance returned by %s::%s()', $factory[0]->getClass(), $factory[1]);
579579
}
580580
}
581581
}

‎Tests/Fixtures/php/services10.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public function compile()
4747
* This service is shared.
4848
* This method always returns the same instance of the service.
4949
*
50-
* @return \stdClass A stdClass instance.
50+
* @return \stdClass A stdClass instance
5151
*/
5252
protected function getTestService()
5353
{

‎Tests/Fixtures/php/services12.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public function compile()
5151
* This service is shared.
5252
* This method always returns the same instance of the service.
5353
*
54-
* @return \stdClass A stdClass instance.
54+
* @return \stdClass A stdClass instance
5555
*/
5656
protected function getTestService()
5757
{

‎Tests/Fixtures/php/services13.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public function compile()
4545
* This service is shared.
4646
* This method always returns the same instance of the service.
4747
*
48-
* @return \stdClass A stdClass instance.
48+
* @return \stdClass A stdClass instance
4949
*/
5050
protected function getBarService()
5151
{

‎Tests/Fixtures/php/services19.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function __construct()
3636
* This service is shared.
3737
* This method always returns the same instance of the service.
3838
*
39-
* @return \Bar\FooClass A Bar\FooClass instance.
39+
* @return \Bar\FooClass A Bar\FooClass instance
4040
*/
4141
protected function getServiceFromAnonymousFactoryService()
4242
{
@@ -49,7 +49,7 @@ protected function getServiceFromAnonymousFactoryService()
4949
* This service is shared.
5050
* This method always returns the same instance of the service.
5151
*
52-
* @return \Bar\FooClass A Bar\FooClass instance.
52+
* @return \Bar\FooClass A Bar\FooClass instance
5353
*/
5454
protected function getServiceWithMethodCallAndFactoryService()
5555
{

‎Tests/Fixtures/php/services24.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public function __construct()
3434
*
3535
* This service is autowired.
3636
*
37-
* @return \Foo A Foo instance.
37+
* @return \Foo A Foo instance
3838
*/
3939
protected function getFooService()
4040
{

‎Tests/Fixtures/php/services9.php

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public function __construct()
6161
* This service is shared.
6262
* This method always returns the same instance of the service.
6363
*
64-
* @return \Bar\FooClass A Bar\FooClass instance.
64+
* @return \Bar\FooClass A Bar\FooClass instance
6565
*/
6666
protected function getBarService()
6767
{
@@ -80,7 +80,7 @@ protected function getBarService()
8080
* This service is shared.
8181
* This method always returns the same instance of the service.
8282
*
83-
* @return \Baz A Baz instance.
83+
* @return \Baz A Baz instance
8484
*/
8585
protected function getBazService()
8686
{
@@ -97,7 +97,7 @@ protected function getBazService()
9797
* This service is shared.
9898
* This method always returns the same instance of the service.
9999
*
100-
* @return \stdClass A stdClass instance.
100+
* @return \stdClass A stdClass instance
101101
*/
102102
protected function getConfiguredServiceService()
103103
{
@@ -131,7 +131,7 @@ protected function getConfiguredServiceSimpleService()
131131
* This service is shared.
132132
* This method always returns the same instance of the service.
133133
*
134-
* @return \stdClass A stdClass instance.
134+
* @return \stdClass A stdClass instance
135135
*/
136136
protected function getDecoratedService()
137137
{
@@ -144,7 +144,7 @@ protected function getDecoratedService()
144144
* This service is shared.
145145
* This method always returns the same instance of the service.
146146
*
147-
* @return \stdClass A stdClass instance.
147+
* @return \stdClass A stdClass instance
148148
*/
149149
protected function getDecoratorServiceService()
150150
{
@@ -157,7 +157,7 @@ protected function getDecoratorServiceService()
157157
* This service is shared.
158158
* This method always returns the same instance of the service.
159159
*
160-
* @return \stdClass A stdClass instance.
160+
* @return \stdClass A stdClass instance
161161
*/
162162
protected function getDecoratorServiceWithNameService()
163163
{
@@ -170,7 +170,7 @@ protected function getDecoratorServiceWithNameService()
170170
* This service is shared.
171171
* This method always returns the same instance of the service.
172172
*
173-
* @return \stdClass A stdClass instance.
173+
* @return \stdClass A stdClass instance
174174
*
175175
* @deprecated The "deprecated_service" service is deprecated. You should stop using it, as it will soon be removed.
176176
*/
@@ -187,7 +187,7 @@ protected function getDeprecatedServiceService()
187187
* This service is shared.
188188
* This method always returns the same instance of the service.
189189
*
190-
* @return \Bar A Bar instance.
190+
* @return \Bar A Bar instance
191191
*/
192192
protected function getFactoryServiceService()
193193
{
@@ -213,7 +213,7 @@ protected function getFactoryServiceSimpleService()
213213
* This service is shared.
214214
* This method always returns the same instance of the service.
215215
*
216-
* @return \Bar\FooClass A Bar\FooClass instance.
216+
* @return \Bar\FooClass A Bar\FooClass instance
217217
*/
218218
protected function getFooService()
219219
{
@@ -237,7 +237,7 @@ protected function getFooService()
237237
* This service is shared.
238238
* This method always returns the same instance of the service.
239239
*
240-
* @return object A %baz_class% instance.
240+
* @return object A %baz_class% instance
241241
*/
242242
protected function getFoo_BazService()
243243
{
@@ -251,7 +251,7 @@ protected function getFoo_BazService()
251251
/**
252252
* Gets the 'foo_bar' service.
253253
*
254-
* @return object A %foo_class% instance.
254+
* @return object A %foo_class% instance
255255
*/
256256
protected function getFooBarService()
257257
{
@@ -266,7 +266,7 @@ protected function getFooBarService()
266266
* This service is shared.
267267
* This method always returns the same instance of the service.
268268
*
269-
* @return \Foo A Foo instance.
269+
* @return \Foo A Foo instance
270270
*/
271271
protected function getFooWithInlineService()
272272
{
@@ -283,7 +283,7 @@ protected function getFooWithInlineService()
283283
* This service is shared.
284284
* This method always returns the same instance of the service.
285285
*
286-
* @return \Bar\FooClass A Bar\FooClass instance.
286+
* @return \Bar\FooClass A Bar\FooClass instance
287287
*/
288288
protected function getMethodCall1Service()
289289
{
@@ -310,7 +310,7 @@ protected function getMethodCall1Service()
310310
* This service is shared.
311311
* This method always returns the same instance of the service.
312312
*
313-
* @return \FooBarBaz A FooBarBaz instance.
313+
* @return \FooBarBaz A FooBarBaz instance
314314
*/
315315
protected function getNewFactoryServiceService()
316316
{
@@ -340,7 +340,7 @@ protected function getRequestService()
340340
* This service is shared.
341341
* This method always returns the same instance of the service.
342342
*
343-
* @return \Bar\FooClass A Bar\FooClass instance.
343+
* @return \Bar\FooClass A Bar\FooClass instance
344344
*/
345345
protected function getServiceFromStaticMethodService()
346346
{
@@ -357,7 +357,7 @@ protected function getServiceFromStaticMethodService()
357357
* If you want to be able to request this service from the container directly,
358358
* make it public, otherwise you might end up with broken code.
359359
*
360-
* @return \ConfClass A ConfClass instance.
360+
* @return \ConfClass A ConfClass instance
361361
*/
362362
protected function getConfiguratorServiceService()
363363
{
@@ -412,7 +412,7 @@ protected function getFactorySimpleService()
412412
* If you want to be able to request this service from the container directly,
413413
* make it public, otherwise you might end up with broken code.
414414
*
415-
* @return \Bar A Bar instance.
415+
* @return \Bar A Bar instance
416416
*/
417417
protected function getInlinedService()
418418
{
@@ -434,7 +434,7 @@ protected function getInlinedService()
434434
* If you want to be able to request this service from the container directly,
435435
* make it public, otherwise you might end up with broken code.
436436
*
437-
* @return \FactoryClass A FactoryClass instance.
437+
* @return \FactoryClass A FactoryClass instance
438438
*/
439439
protected function getNewFactoryService()
440440
{

0 commit comments

Comments
 (0)