Skip to content

Commit 3698358

Browse files
committed
Merge branch '3.1'
* 3.1: fixed CS fixed CS fixed CS fixed form tests [Console] Fix formatting of SymfonyStyle::comment() [Form] fix post max size translation type extension for >= 2.8 [Security] Allow LDAP loadUser override removed dots at the end of @param and @return fixed typo
2 parents 026499e + b7272b6 commit 3698358

File tree

12 files changed

+54
-54
lines changed

12 files changed

+54
-54
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
@@ -472,7 +472,7 @@ public function get($id, $invalidBehavior = ContainerInterface::EXCEPTION_ON_INV
472472
* parameter, the value will still be 'bar' as defined in the ContainerBuilder
473473
* constructor.
474474
*
475-
* @param ContainerBuilder $container The ContainerBuilder instance to merge.
475+
* @param ContainerBuilder $container The ContainerBuilder instance to merge
476476
*
477477
* @throws BadMethodCallException When this ContainerBuilder is frozen
478478
*/
@@ -959,7 +959,7 @@ public function resolveServices($value)
959959
*
960960
* @param string $name The tag name
961961
*
962-
* @return array An array of tags with the tagged service as key, holding a list of attribute arrays.
962+
* @return array An array of tags with the tagged service as key, holding a list of attribute arrays
963963
*/
964964
public function findTaggedServiceIds($name)
965965
{
@@ -1015,7 +1015,7 @@ public function getExpressionLanguageProviders()
10151015
/**
10161016
* Returns the Service Conditionals.
10171017
*
1018-
* @param mixed $value An array of conditionals to return.
1018+
* @param mixed $value An array of conditionals to return
10191019
*
10201020
* @return array An array of Service conditionals
10211021
*/

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
@@ -571,16 +571,16 @@ private function addService($id, $definition)
571571
if ($definition->isSynthetic()) {
572572
$return[] = '@throws RuntimeException always since this service is expected to be injected dynamically';
573573
} elseif ($class = $definition->getClass()) {
574-
$return[] = sprintf('@return %s A %s instance.', 0 === strpos($class, '%') ? 'object' : '\\'.ltrim($class, '\\'), ltrim($class, '\\'));
574+
$return[] = sprintf('@return %s A %s instance', 0 === strpos($class, '%') ? 'object' : '\\'.ltrim($class, '\\'), ltrim($class, '\\'));
575575
} elseif ($definition->getFactory()) {
576576
$factory = $definition->getFactory();
577577
if (is_string($factory)) {
578-
$return[] = sprintf('@return object An instance returned by %s().', $factory);
578+
$return[] = sprintf('@return object An instance returned by %s()', $factory);
579579
} elseif (is_array($factory) && (is_string($factory[0]) || $factory[0] instanceof Definition || $factory[0] instanceof Reference)) {
580580
if (is_string($factory[0]) || $factory[0] instanceof Reference) {
581-
$return[] = sprintf('@return object An instance returned by %s::%s().', (string) $factory[0], $factory[1]);
581+
$return[] = sprintf('@return object An instance returned by %s::%s()', (string) $factory[0], $factory[1]);
582582
} elseif ($factory[0] instanceof Definition) {
583-
$return[] = sprintf('@return object An instance returned by %s::%s().', $factory[0]->getClass(), $factory[1]);
583+
$return[] = sprintf('@return object An instance returned by %s::%s()', $factory[0]->getClass(), $factory[1]);
584584
}
585585
}
586586
}

LazyProxy/PhpDumper/DumperInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public function isProxyCandidate(Definition $definition);
3434
*
3535
* @param Definition $definition
3636
* @param string $id service identifier
37-
* @param string $methodName the method name to get the service, will be added to the interface in 4.0.
37+
* @param string $methodName the method name to get the service, will be added to the interface in 4.0
3838
*
3939
* @return string
4040
*/

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
{

0 commit comments

Comments
 (0)