Merge branch '2.7' into 2.8

* 2.7:
  fixed @return when returning this or static
  override property constraints in child class
  [Console] improved code coverage of Command class
  Only count on arrays or countables to avoid warnings in PHP 7.2

Author: fabpot

Compiler/ServiceReferenceGraph.php

@@ -45,7 +45,7 @@ public function hasNode($id)
      *
      * @param string $id The id to retrieve
      *
-     * @return ServiceReferenceGraphNode The node matching the supplied identifier
+     * @return ServiceReferenceGraphNode
      *
      * @throws InvalidArgumentException if no node matches the supplied identifier
      */
@@ -61,7 +61,7 @@ public function getNode($id)
     /**
      * Returns all nodes.
      *
-     * @return ServiceReferenceGraphNode[] An array of all ServiceReferenceGraphNode objects
+     * @return ServiceReferenceGraphNode[]
      */
     public function getNodes()
     {

ContainerBuilder.php

@@ -201,7 +201,7 @@ public function getResources()
      *
      * @param ResourceInterface $resource A resource instance
      *
-     * @return ContainerBuilder The current instance
+     * @return $this
      */
     public function addResource(ResourceInterface $resource)
     {
@@ -219,7 +219,7 @@ public function addResource(ResourceInterface $resource)
      *
      * @param ResourceInterface[] $resources An array of resources
      *
-     * @return ContainerBuilder The current instance
+     * @return $this
      */
     public function setResources(array $resources)
     {
@@ -237,7 +237,7 @@ public function setResources(array $resources)
      *
      * @param object $object An object instance
      *
-     * @return ContainerBuilder The current instance
+     * @return $this
      */
     public function addObjectResource($object)
     {
@@ -253,7 +253,7 @@ public function addObjectResource($object)
      *
      * @param \ReflectionClass $class
      *
-     * @return ContainerBuilder The current instance
+     * @return $this
      */
     public function addClassResource(\ReflectionClass $class)
     {
@@ -276,7 +276,7 @@ public function addClassResource(\ReflectionClass $class)
      * @param string $extension The extension alias or namespace
      * @param array  $values    An array of values that customizes the extension
      *
-     * @return ContainerBuilder The current instance
+     * @return $this
      *
      * @throws BadMethodCallException When this ContainerBuilder is frozen
      * @throws \LogicException        if the container is frozen
@@ -300,7 +300,7 @@ public function loadFromExtension($extension, array $values = array())
      * @param CompilerPassInterface $pass A compiler pass
      * @param string                $type The type of compiler pass
      *
-     * @return ContainerBuilder The current instance
+     * @return $this
      */
     public function addCompilerPass(CompilerPassInterface $pass, $type = PassConfig::TYPE_BEFORE_OPTIMIZATION)
     {

Definition.php

@@ -61,7 +61,7 @@ public function __construct($class = null, array $arguments = array())
      *
      * @param string|array $factory A PHP function or an array containing a class/Reference and a method to call
      *
-     * @return Definition The current instance
+     * @return $this
      */
     public function setFactory($factory)
     {
@@ -90,7 +90,7 @@ public function getFactory()
      *
      * @param string $factoryClass The factory class name
      *
-     * @return Definition The current instance
+     * @return $this
      *
      * @deprecated since version 2.6, to be removed in 3.0.
      */
@@ -124,7 +124,7 @@ public function getFactoryClass($triggerDeprecationError = true)
      *
      * @param string $factoryMethod The factory method name
      *
-     * @return Definition The current instance
+     * @return $this
      *
      * @deprecated since version 2.6, to be removed in 3.0.
      */
@@ -144,7 +144,7 @@ public function setFactoryMethod($factoryMethod)
      * @param null|string $renamedId The new decorated service id
      * @param int         $priority  The priority of decoration
      *
-     * @return Definition The current instance
+     * @return $this
      *
      * @throws InvalidArgumentException In case the decorated service id and the new decorated service id are equals.
      */
@@ -194,7 +194,7 @@ public function getFactoryMethod($triggerDeprecationError = true)
      *
      * @param string $factoryService The factory service id
      *
-     * @return Definition The current instance
+     * @return $this
      *
      * @deprecated since version 2.6, to be removed in 3.0.
      */
@@ -230,7 +230,7 @@ public function getFactoryService($triggerDeprecationError = true)
      *
      * @param string $class The service class
      *
-     * @return Definition The current instance
+     * @return $this
      */
     public function setClass($class)
     {
@@ -254,7 +254,7 @@ public function getClass()
      *
      * @param array $arguments An array of arguments
      *
-     * @return Definition The current instance
+     * @return $this
      */
     public function setArguments(array $arguments)
     {
@@ -287,7 +287,7 @@ public function setProperty($name, $value)
      *
      * @param mixed $argument An argument
      *
-     * @return Definition The current instance
+     * @return $this
      */
     public function addArgument($argument)
     {
@@ -302,7 +302,7 @@ public function addArgument($argument)
      * @param int   $index
      * @param mixed $argument
      *
-     * @return Definition The current instance
+     * @return $this
      *
      * @throws OutOfBoundsException When the replaced argument does not exist
      */
@@ -350,7 +350,7 @@ public function getArgument($index)
      *
      * @param array $calls An array of method calls
      *
-     * @return Definition The current instance
+     * @return $this
      */
     public function setMethodCalls(array $calls = array())
     {
@@ -368,7 +368,7 @@ public function setMethodCalls(array $calls = array())
      * @param string $method    The method name to call
      * @param array  $arguments An array of arguments to pass to the method call
      *
-     * @return Definition The current instance
+     * @return $this
      *
      * @throws InvalidArgumentException on empty $method param
      */
@@ -387,7 +387,7 @@ public function addMethodCall($method, array $arguments = array())
      *
      * @param string $method The method name to remove
      *
-     * @return Definition The current instance
+     * @return $this
      */
     public function removeMethodCall($method)
     {
@@ -434,7 +434,7 @@ public function getMethodCalls()
      *
      * @param array $tags
      *
-     * @return Definition the current instance
+     * @return $this
      */
     public function setTags(array $tags)
     {
@@ -471,7 +471,7 @@ public function getTag($name)
      * @param string $name       The tag name
      * @param array  $attributes An array of attributes
      *
-     * @return Definition The current instance
+     * @return $this
      */
     public function addTag($name, array $attributes = array())
     {
@@ -497,7 +497,7 @@ public function hasTag($name)
      *
      * @param string $name The tag name
      *
-     * @return Definition
+     * @return $this
      */
     public function clearTag($name)
     {
@@ -509,7 +509,7 @@ public function clearTag($name)
     /**
      * Clears the tags for this definition.
      *
-     * @return Definition The current instance
+     * @return $this
      */
     public function clearTags()
     {
@@ -523,7 +523,7 @@ public function clearTags()
      *
      * @param string $file A full pathname to include
      *
-     * @return Definition The current instance
+     * @return $this
      */
     public function setFile($file)
     {
@@ -571,7 +571,7 @@ public function isShared()
      *
      * @param string $scope Whether the service must be shared or not
      *
-     * @return Definition The current instance
+     * @return $this
      *
      * @deprecated since version 2.8, to be removed in 3.0.
      */
@@ -611,7 +611,7 @@ public function getScope($triggerDeprecationError = true)
      *
      * @param bool $boolean
      *
-     * @return Definition The current instance
+     * @return $this
      */
     public function setPublic($boolean)
     {
@@ -635,7 +635,7 @@ public function isPublic()
      *
      * @param bool $boolean
      *
-     * @return Definition The current instance
+     * @return $this
      *
      * @deprecated since version 2.7, will be removed in 3.0.
      */
@@ -671,7 +671,7 @@ public function isSynchronized($triggerDeprecationError = true)
      *
      * @param bool $lazy
      *
-     * @return Definition The current instance
+     * @return $this
      */
     public function setLazy($lazy)
     {
@@ -696,7 +696,7 @@ public function isLazy()
      *
      * @param bool $boolean
      *
-     * @return Definition the current instance
+     * @return $this
      */
     public function setSynthetic($boolean)
     {
@@ -722,7 +722,7 @@ public function isSynthetic()
      *
      * @param bool $boolean
      *
-     * @return Definition the current instance
+     * @return $this
      */
     public function setAbstract($boolean)
     {
@@ -800,7 +800,7 @@ public function getDeprecationMessage($id)
      *
      * @param callable $callable A PHP callable
      *
-     * @return Definition The current instance
+     * @return $this
      */
     public function setConfigurator($callable)
     {

DefinitionDecorator.php

@@ -212,7 +212,7 @@ public function getArgument($index)
      * @param int   $index
      * @param mixed $value
      *
-     * @return DefinitionDecorator the current instance
+     * @return $this
      *
      * @throws InvalidArgumentException when $index isn't an integer
      */