Skip to content

Commit 308a8c3

Browse files
fabpotfabpot
committed
Merge branch '3.2'
* 3.2: [FrameworkBundle] Ignore AnnotationException exceptions in the AnnotationsCacheWarmer fixed @return when returning this or static override property constraints in child class removed unneeded comment [Console] improved code coverage of Command class [FrameworkBundle] Make TemplateController working without the Templating component [FrameworkBundle] Allow multiple transactions with the same name Only count on arrays or countables to avoid warnings in PHP 7.2
2 parents fe71baf + 22283bb commit 308a8c3

File tree

3 files changed

+27
-27
lines changed

3 files changed

+27
-27
lines changed

‎Compiler/ServiceReferenceGraph.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public function hasNode($id)
4545
*
4646
* @param string $id The id to retrieve
4747
*
48-
* @return ServiceReferenceGraphNode The node matching the supplied identifier
48+
* @return ServiceReferenceGraphNode
4949
*
5050
* @throws InvalidArgumentException if no node matches the supplied identifier
5151
*/
@@ -61,7 +61,7 @@ public function getNode($id)
6161
/**
6262
* Returns all nodes.
6363
*
64-
* @return ServiceReferenceGraphNode[] An array of all ServiceReferenceGraphNode objects
64+
* @return ServiceReferenceGraphNode[]
6565
*/
6666
public function getNodes()
6767
{

‎ContainerBuilder.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ public function getResources()
206206
*
207207
* @param ResourceInterface $resource A resource instance
208208
*
209-
* @return ContainerBuilder The current instance
209+
* @return $this
210210
*/
211211
public function addResource(ResourceInterface $resource)
212212
{
@@ -224,7 +224,7 @@ public function addResource(ResourceInterface $resource)
224224
*
225225
* @param ResourceInterface[] $resources An array of resources
226226
*
227-
* @return ContainerBuilder The current instance
227+
* @return $this
228228
*/
229229
public function setResources(array $resources)
230230
{
@@ -242,7 +242,7 @@ public function setResources(array $resources)
242242
*
243243
* @param object $object An object instance
244244
*
245-
* @return ContainerBuilder The current instance
245+
* @return $this
246246
*/
247247
public function addObjectResource($object)
248248
{
@@ -258,7 +258,7 @@ public function addObjectResource($object)
258258
*
259259
* @param \ReflectionClass $class
260260
*
261-
* @return ContainerBuilder The current instance
261+
* @return $this
262262
*/
263263
public function addClassResource(\ReflectionClass $class)
264264
{
@@ -281,7 +281,7 @@ public function addClassResource(\ReflectionClass $class)
281281
* @param string $extension The extension alias or namespace
282282
* @param array $values An array of values that customizes the extension
283283
*
284-
* @return ContainerBuilder The current instance
284+
* @return $this
285285
*
286286
* @throws BadMethodCallException When this ContainerBuilder is frozen
287287
* @throws \LogicException if the container is frozen
@@ -306,7 +306,7 @@ public function loadFromExtension($extension, array $values = array())
306306
* @param string $type The type of compiler pass
307307
* @param int $priority Used to sort the passes
308308
*
309-
* @return ContainerBuilder The current instance
309+
* @return $this
310310
*/
311311
public function addCompilerPass(CompilerPassInterface $pass, $type = PassConfig::TYPE_BEFORE_OPTIMIZATION/*, $priority = 0*/)
312312
{

‎Definition.php

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public function __construct($class = null, array $arguments = array())
5656
*
5757
* @param string|array $factory A PHP function or an array containing a class/Reference and a method to call
5858
*
59-
* @return Definition The current instance
59+
* @return $this
6060
*/
6161
public function setFactory($factory)
6262
{
@@ -86,7 +86,7 @@ public function getFactory()
8686
* @param null|string $renamedId The new decorated service id
8787
* @param int $priority The priority of decoration
8888
*
89-
* @return Definition The current instance
89+
* @return $this
9090
*
9191
* @throws InvalidArgumentException In case the decorated service id and the new decorated service id are equals.
9292
*/
@@ -120,7 +120,7 @@ public function getDecoratedService()
120120
*
121121
* @param string $class The service class
122122
*
123-
* @return Definition The current instance
123+
* @return $this
124124
*/
125125
public function setClass($class)
126126
{
@@ -144,7 +144,7 @@ public function getClass()
144144
*
145145
* @param array $arguments An array of arguments
146146
*
147-
* @return Definition The current instance
147+
* @return $this
148148
*/
149149
public function setArguments(array $arguments)
150150
{
@@ -177,7 +177,7 @@ public function setProperty($name, $value)
177177
*
178178
* @param mixed $argument An argument
179179
*
180-
* @return Definition The current instance
180+
* @return $this
181181
*/
182182
public function addArgument($argument)
183183
{
@@ -192,7 +192,7 @@ public function addArgument($argument)
192192
* @param int $index
193193
* @param mixed $argument
194194
*
195-
* @return Definition The current instance
195+
* @return $this
196196
*
197197
* @throws OutOfBoundsException When the replaced argument does not exist
198198
*/
@@ -240,7 +240,7 @@ public function getArgument($index)
240240
*
241241
* @param array $calls An array of method calls
242242
*
243-
* @return Definition The current instance
243+
* @return $this
244244
*/
245245
public function setMethodCalls(array $calls = array())
246246
{
@@ -258,7 +258,7 @@ public function setMethodCalls(array $calls = array())
258258
* @param string $method The method name to call
259259
* @param array $arguments An array of arguments to pass to the method call
260260
*
261-
* @return Definition The current instance
261+
* @return $this
262262
*
263263
* @throws InvalidArgumentException on empty $method param
264264
*/
@@ -277,7 +277,7 @@ public function addMethodCall($method, array $arguments = array())
277277
*
278278
* @param string $method The method name to remove
279279
*
280-
* @return Definition The current instance
280+
* @return $this
281281
*/
282282
public function removeMethodCall($method)
283283
{
@@ -324,7 +324,7 @@ public function getMethodCalls()
324324
*
325325
* @param array $tags
326326
*
327-
* @return Definition the current instance
327+
* @return $this
328328
*/
329329
public function setTags(array $tags)
330330
{
@@ -361,7 +361,7 @@ public function getTag($name)
361361
* @param string $name The tag name
362362
* @param array $attributes An array of attributes
363363
*
364-
* @return Definition The current instance
364+
* @return $this
365365
*/
366366
public function addTag($name, array $attributes = array())
367367
{
@@ -387,7 +387,7 @@ public function hasTag($name)
387387
*
388388
* @param string $name The tag name
389389
*
390-
* @return Definition
390+
* @return $this
391391
*/
392392
public function clearTag($name)
393393
{
@@ -399,7 +399,7 @@ public function clearTag($name)
399399
/**
400400
* Clears the tags for this definition.
401401
*
402-
* @return Definition The current instance
402+
* @return $this
403403
*/
404404
public function clearTags()
405405
{
@@ -413,7 +413,7 @@ public function clearTags()
413413
*
414414
* @param string $file A full pathname to include
415415
*
416-
* @return Definition The current instance
416+
* @return $this
417417
*/
418418
public function setFile($file)
419419
{
@@ -461,7 +461,7 @@ public function isShared()
461461
*
462462
* @param bool $boolean
463463
*
464-
* @return Definition The current instance
464+
* @return $this
465465
*/
466466
public function setPublic($boolean)
467467
{
@@ -485,7 +485,7 @@ public function isPublic()
485485
*
486486
* @param bool $lazy
487487
*
488-
* @return Definition The current instance
488+
* @return $this
489489
*/
490490
public function setLazy($lazy)
491491
{
@@ -510,7 +510,7 @@ public function isLazy()
510510
*
511511
* @param bool $boolean
512512
*
513-
* @return Definition the current instance
513+
* @return $this
514514
*/
515515
public function setSynthetic($boolean)
516516
{
@@ -536,7 +536,7 @@ public function isSynthetic()
536536
*
537537
* @param bool $boolean
538538
*
539-
* @return Definition the current instance
539+
* @return $this
540540
*/
541541
public function setAbstract($boolean)
542542
{
@@ -614,7 +614,7 @@ public function getDeprecationMessage($id)
614614
*
615615
* @param string|array $configurator A PHP callable
616616
*
617-
* @return Definition The current instance
617+
* @return $this
618618
*/
619619
public function setConfigurator($configurator)
620620
{

0 commit comments

Comments
 (0)