Merge branch '2.8' into 3.1

* 2.8:
  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
  Only count on arrays or countables to avoid warnings in PHP 7.2

PropertyAccess.php

@@ -21,7 +21,7 @@ final class PropertyAccess
     /**
      * Creates a property accessor with the default configuration.
      *
-     * @return PropertyAccessor The new property accessor
+     * @return PropertyAccessor
      */
     public static function createPropertyAccessor()
     {
@@ -31,7 +31,7 @@ public static function createPropertyAccessor()
     /**
      * Creates a property accessor builder.
      *
-     * @return PropertyAccessorBuilder The new property accessor builder
+     * @return PropertyAccessor
      */
     public static function createPropertyAccessorBuilder()
     {

PropertyAccessorBuilder.php

@@ -31,7 +31,7 @@ class PropertyAccessorBuilder
     /**
      * Enables the use of "__call" by the PropertyAccessor.
      *
-     * @return PropertyAccessorBuilder The builder object
+     * @return $this
      */
     public function enableMagicCall()
     {
@@ -43,7 +43,7 @@ public function enableMagicCall()
     /**
      * Disables the use of "__call" by the PropertyAccessor.
      *
-     * @return PropertyAccessorBuilder The builder object
+     * @return $this
      */
     public function disableMagicCall()
     {
@@ -66,7 +66,7 @@ public function isMagicCallEnabled()
      * This has no influence on writing non-existing indices with PropertyAccessorInterface::setValue()
      * which are always created on-the-fly.
      *
-     * @return PropertyAccessorBuilder The builder object
+     * @return $this
      */
     public function enableExceptionOnInvalidIndex()
     {
@@ -80,7 +80,7 @@ public function enableExceptionOnInvalidIndex()
      *
      * Instead, null is returned when calling PropertyAccessorInterface::getValue() on a non-existing index.
      *
-     * @return PropertyAccessorBuilder The builder object
+     * @return $this
      */
     public function disableExceptionOnInvalidIndex()
     {