Skip to content

Commit 7224d38

Browse files
fabpotfabpot
committed
Merge branch '2.7' into 2.8
* 2.7: removed dots at the end of @param and @return fixed typo
2 parents 955b51b + 8b7c24f commit 7224d38

File tree

11 files changed

+49
-49
lines changed

11 files changed

+49
-49
lines changed

‎Compiler/AnalyzeServiceReferencesPass.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ private function processArguments(array $arguments)
126126
/**
127127
* Returns a service definition given the full name or an alias.
128128
*
129-
* @param string $id A full id or alias for a service definition.
129+
* @param string $id A full id or alias for a service definition
130130
*
131131
* @return Definition|null The definition related to the supplied id
132132
*/

‎ContainerBuilder.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ public function getScopes($triggerDeprecationError = true)
354354
/**
355355
* Returns all Scope children.
356356
*
357-
* @return array An array of scope children.
357+
* @return array An array of scope children
358358
*
359359
* @deprecated since version 2.8, to be removed in 3.0.
360360
*/
@@ -510,7 +510,7 @@ public function get($id, $invalidBehavior = ContainerInterface::EXCEPTION_ON_INV
510510
* parameter, the value will still be 'bar' as defined in the ContainerBuilder
511511
* constructor.
512512
*
513-
* @param ContainerBuilder $container The ContainerBuilder instance to merge.
513+
* @param ContainerBuilder $container The ContainerBuilder instance to merge
514514
*
515515
* @throws BadMethodCallException When this ContainerBuilder is frozen
516516
*/
@@ -1011,7 +1011,7 @@ public function resolveServices($value)
10111011
*
10121012
* @param string $name The tag name
10131013
*
1014-
* @return array An array of tags with the tagged service as key, holding a list of attribute arrays.
1014+
* @return array An array of tags with the tagged service as key, holding a list of attribute arrays
10151015
*/
10161016
public function findTaggedServiceIds($name)
10171017
{
@@ -1067,7 +1067,7 @@ public function getExpressionLanguageProviders()
10671067
/**
10681068
* Returns the Service Conditionals.
10691069
*
1070-
* @param mixed $value An array of conditionals to return.
1070+
* @param mixed $value An array of conditionals to return
10711071
*
10721072
* @return array An array of Service conditionals
10731073
*/

‎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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -570,22 +570,22 @@ private function addService($id, $definition)
570570
if ($definition->isSynthetic()) {
571571
$return[] = '@throws RuntimeException always since this service is expected to be injected dynamically';
572572
} elseif ($class = $definition->getClass()) {
573-
$return[] = sprintf('@return %s A %s instance.', 0 === strpos($class, '%') ? 'object' : '\\'.ltrim($class, '\\'), ltrim($class, '\\'));
573+
$return[] = sprintf('@return %s A %s instance', 0 === strpos($class, '%') ? 'object' : '\\'.ltrim($class, '\\'), ltrim($class, '\\'));
574574
} elseif ($definition->getFactory()) {
575575
$factory = $definition->getFactory();
576576
if (is_string($factory)) {
577-
$return[] = sprintf('@return object An instance returned by %s().', $factory);
577+
$return[] = sprintf('@return object An instance returned by %s()', $factory);
578578
} elseif (is_array($factory) && (is_string($factory[0]) || $factory[0] instanceof Definition || $factory[0] instanceof Reference)) {
579579
if (is_string($factory[0]) || $factory[0] instanceof Reference) {
580-
$return[] = sprintf('@return object An instance returned by %s::%s().', (string) $factory[0], $factory[1]);
580+
$return[] = sprintf('@return object An instance returned by %s::%s()', (string) $factory[0], $factory[1]);
581581
} elseif ($factory[0] instanceof Definition) {
582-
$return[] = sprintf('@return object An instance returned by %s::%s().', $factory[0]->getClass(), $factory[1]);
582+
$return[] = sprintf('@return object An instance returned by %s::%s()', $factory[0]->getClass(), $factory[1]);
583583
}
584584
}
585585
} elseif ($definition->getFactoryClass(false)) {
586-
$return[] = sprintf('@return object An instance returned by %s::%s().', $definition->getFactoryClass(false), $definition->getFactoryMethod(false));
586+
$return[] = sprintf('@return object An instance returned by %s::%s()', $definition->getFactoryClass(false), $definition->getFactoryMethod(false));
587587
} elseif ($definition->getFactoryService(false)) {
588-
$return[] = sprintf('@return object An instance returned by %s::%s().', $definition->getFactoryService(false), $definition->getFactoryMethod(false));
588+
$return[] = sprintf('@return object An instance returned by %s::%s()', $definition->getFactoryService(false), $definition->getFactoryMethod(false));
589589
}
590590

591591
$scope = $definition->getScope(false);

‎Tests/Fixtures/php/services10.php‎

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

‎Tests/Fixtures/php/services12.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public function compile()
5656
* This service is shared.
5757
* This method always returns the same instance of the service.
5858
*
59-
* @return \stdClass A stdClass instance.
59+
* @return \stdClass A stdClass instance
6060
*/
6161
protected function getTestService()
6262
{

‎Tests/Fixtures/php/services13.php‎

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

‎Tests/Fixtures/php/services19.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public function __construct()
3737
* This service is shared.
3838
* This method always returns the same instance of the service.
3939
*
40-
* @return \Bar\FooClass A Bar\FooClass instance.
40+
* @return \Bar\FooClass A Bar\FooClass instance
4141
*/
4242
protected function getServiceFromAnonymousFactoryService()
4343
{
@@ -50,7 +50,7 @@ protected function getServiceFromAnonymousFactoryService()
5050
* This service is shared.
5151
* This method always returns the same instance of the service.
5252
*
53-
* @return \Bar\FooClass A Bar\FooClass instance.
53+
* @return \Bar\FooClass A Bar\FooClass instance
5454
*/
5555
protected function getServiceWithMethodCallAndFactoryService()
5656
{

‎Tests/Fixtures/php/services20.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public function __construct()
3737
* This service is shared.
3838
* This method always returns the same instance of the service.
3939
*
40-
* @return \stdClass A stdClass instance.
40+
* @return \stdClass A stdClass instance
4141
*/
4242
protected function getDependsOnRequestService()
4343
{
@@ -54,7 +54,7 @@ protected function getDependsOnRequestService()
5454
* This service is shared.
5555
* This method always returns the same instance of the service.
5656
*
57-
* @return \Request A Request instance.
57+
* @return \Request A Request instance
5858
*/
5959
protected function getRequestService()
6060
{

‎Tests/Fixtures/php/services9.php‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public function __construct()
5858
* This service is shared.
5959
* This method always returns the same instance of the service.
6060
*
61-
* @return \Bar\FooClass A Bar\FooClass instance.
61+
* @return \Bar\FooClass A Bar\FooClass instance
6262
*/
6363
protected function getBarService()
6464
{
@@ -77,7 +77,7 @@ protected function getBarService()
7777
* This service is shared.
7878
* This method always returns the same instance of the service.
7979
*
80-
* @return \Baz A Baz instance.
80+
* @return \Baz A Baz instance
8181
*/
8282
protected function getBazService()
8383
{
@@ -94,7 +94,7 @@ protected function getBazService()
9494
* This service is shared.
9595
* This method always returns the same instance of the service.
9696
*
97-
* @return \stdClass A stdClass instance.
97+
* @return \stdClass A stdClass instance
9898
*/
9999
protected function getConfiguredServiceService()
100100
{
@@ -111,7 +111,7 @@ protected function getConfiguredServiceService()
111111
* This service is shared.
112112
* This method always returns the same instance of the service.
113113
*
114-
* @return \stdClass A stdClass instance.
114+
* @return \stdClass A stdClass instance
115115
*/
116116
protected function getDecoratedService()
117117
{
@@ -124,7 +124,7 @@ protected function getDecoratedService()
124124
* This service is shared.
125125
* This method always returns the same instance of the service.
126126
*
127-
* @return \stdClass A stdClass instance.
127+
* @return \stdClass A stdClass instance
128128
*/
129129
protected function getDecoratorServiceService()
130130
{
@@ -137,7 +137,7 @@ protected function getDecoratorServiceService()
137137
* This service is shared.
138138
* This method always returns the same instance of the service.
139139
*
140-
* @return \stdClass A stdClass instance.
140+
* @return \stdClass A stdClass instance
141141
*/
142142
protected function getDecoratorServiceWithNameService()
143143
{
@@ -167,7 +167,7 @@ protected function getDeprecatedServiceService()
167167
* This service is shared.
168168
* This method always returns the same instance of the service.
169169
*
170-
* @return \Bar A Bar instance.
170+
* @return \Bar A Bar instance
171171
*/
172172
protected function getFactoryServiceService()
173173
{
@@ -180,7 +180,7 @@ protected function getFactoryServiceService()
180180
* This service is shared.
181181
* This method always returns the same instance of the service.
182182
*
183-
* @return \Bar\FooClass A Bar\FooClass instance.
183+
* @return \Bar\FooClass A Bar\FooClass instance
184184
*/
185185
protected function getFooService()
186186
{
@@ -204,7 +204,7 @@ protected function getFooService()
204204
* This service is shared.
205205
* This method always returns the same instance of the service.
206206
*
207-
* @return object A %baz_class% instance.
207+
* @return object A %baz_class% instance
208208
*/
209209
protected function getFoo_BazService()
210210
{
@@ -218,7 +218,7 @@ protected function getFoo_BazService()
218218
/**
219219
* Gets the 'foo_bar' service.
220220
*
221-
* @return object A %foo_class% instance.
221+
* @return object A %foo_class% instance
222222
*/
223223
protected function getFooBarService()
224224
{
@@ -233,7 +233,7 @@ protected function getFooBarService()
233233
* This service is shared.
234234
* This method always returns the same instance of the service.
235235
*
236-
* @return \Foo A Foo instance.
236+
* @return \Foo A Foo instance
237237
*/
238238
protected function getFooWithInlineService()
239239
{
@@ -250,7 +250,7 @@ protected function getFooWithInlineService()
250250
* This service is shared.
251251
* This method always returns the same instance of the service.
252252
*
253-
* @return \Bar\FooClass A Bar\FooClass instance.
253+
* @return \Bar\FooClass A Bar\FooClass instance
254254
*/
255255
protected function getMethodCall1Service()
256256
{
@@ -277,7 +277,7 @@ protected function getMethodCall1Service()
277277
* This service is shared.
278278
* This method always returns the same instance of the service.
279279
*
280-
* @return \FooBarBaz A FooBarBaz instance.
280+
* @return \FooBarBaz A FooBarBaz instance
281281
*/
282282
protected function getNewFactoryServiceService()
283283
{
@@ -307,7 +307,7 @@ protected function getRequestService()
307307
* This service is shared.
308308
* This method always returns the same instance of the service.
309309
*
310-
* @return \Bar\FooClass A Bar\FooClass instance.
310+
* @return \Bar\FooClass A Bar\FooClass instance
311311
*/
312312
protected function getServiceFromStaticMethodService()
313313
{
@@ -324,7 +324,7 @@ protected function getServiceFromStaticMethodService()
324324
* If you want to be able to request this service from the container directly,
325325
* make it public, otherwise you might end up with broken code.
326326
*
327-
* @return \ConfClass A ConfClass instance.
327+
* @return \ConfClass A ConfClass instance
328328
*/
329329
protected function getConfiguratorServiceService()
330330
{
@@ -345,7 +345,7 @@ protected function getConfiguratorServiceService()
345345
* If you want to be able to request this service from the container directly,
346346
* make it public, otherwise you might end up with broken code.
347347
*
348-
* @return \Bar A Bar instance.
348+
* @return \Bar A Bar instance
349349
*/
350350
protected function getInlinedService()
351351
{
@@ -367,7 +367,7 @@ protected function getInlinedService()
367367
* If you want to be able to request this service from the container directly,
368368
* make it public, otherwise you might end up with broken code.
369369
*
370-
* @return \FactoryClass A FactoryClass instance.
370+
* @return \FactoryClass A FactoryClass instance
371371
*/
372372
protected function getNewFactoryService()
373373
{

0 commit comments

Comments
 (0)