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

Adapter/AdapterInterface.php

@@ -21,105 +21,105 @@ interface AdapterInterface
     /**
      * @param bool $followLinks
      *
-     * @return AdapterInterface Current instance
+     * @return $this
      */
     public function setFollowLinks($followLinks);
 
     /**
      * @param int $mode
      *
-     * @return AdapterInterface Current instance
+     * @return $this
      */
     public function setMode($mode);
 
     /**
      * @param array $exclude
      *
-     * @return AdapterInterface Current instance
+     * @return $this
      */
     public function setExclude(array $exclude);
 
     /**
      * @param array $depths
      *
-     * @return AdapterInterface Current instance
+     * @return $this
      */
     public function setDepths(array $depths);
 
     /**
      * @param array $names
      *
-     * @return AdapterInterface Current instance
+     * @return $this
      */
     public function setNames(array $names);
 
     /**
      * @param array $notNames
      *
-     * @return AdapterInterface Current instance
+     * @return $this
      */
     public function setNotNames(array $notNames);
 
     /**
      * @param array $contains
      *
-     * @return AdapterInterface Current instance
+     * @return $this
      */
     public function setContains(array $contains);
 
     /**
      * @param array $notContains
      *
-     * @return AdapterInterface Current instance
+     * @return $this
      */
     public function setNotContains(array $notContains);
 
     /**
      * @param array $sizes
      *
-     * @return AdapterInterface Current instance
+     * @return $this
      */
     public function setSizes(array $sizes);
 
     /**
      * @param array $dates
      *
-     * @return AdapterInterface Current instance
+     * @return $this
      */
     public function setDates(array $dates);
 
     /**
      * @param array $filters
      *
-     * @return AdapterInterface Current instance
+     * @return $this
      */
     public function setFilters(array $filters);
 
     /**
      * @param \Closure|int $sort
      *
-     * @return AdapterInterface Current instance
+     * @return $this
      */
     public function setSort($sort);
 
     /**
      * @param array $paths
      *
-     * @return AdapterInterface Current instance
+     * @return $this
      */
     public function setPath(array $paths);
 
     /**
      * @param array $notPaths
      *
-     * @return AdapterInterface Current instance
+     * @return $this
      */
     public function setNotPath(array $notPaths);
 
     /**
      * @param bool $ignore
      *
-     * @return AdapterInterface Current instance
+     * @return $this
      */
     public function ignoreUnreadableDirs($ignore = true);
 

Expression/Expression.php

@@ -29,7 +29,7 @@ class Expression implements ValueInterface
     /**
      * @param string $expr
      *
-     * @return Expression
+     * @return self
      */
     public static function create($expr)
     {

Expression/Regex.php

@@ -57,7 +57,7 @@ class Regex implements ValueInterface
     /**
      * @param string $expr
      *
-     * @return Regex
+     * @return self
      *
      * @throws \InvalidArgumentException
      */
@@ -175,7 +175,7 @@ public function hasOption($option)
     /**
      * @param string $option
      *
-     * @return Regex
+     * @return $this
      */
     public function addOption($option)
     {
@@ -189,7 +189,7 @@ public function addOption($option)
     /**
      * @param string $option
      *
-     * @return Regex
+     * @return $this
      */
     public function removeOption($option)
     {
@@ -201,7 +201,7 @@ public function removeOption($option)
     /**
      * @param bool $startFlag
      *
-     * @return Regex
+     * @return $this
      */
     public function setStartFlag($startFlag)
     {
@@ -221,7 +221,7 @@ public function hasStartFlag()
     /**
      * @param bool $endFlag
      *
-     * @return Regex
+     * @return $this
      */
     public function setEndFlag($endFlag)
     {
@@ -241,7 +241,7 @@ public function hasEndFlag()
     /**
      * @param bool $startJoker
      *
-     * @return Regex
+     * @return $this
      */
     public function setStartJoker($startJoker)
     {
@@ -261,7 +261,7 @@ public function hasStartJoker()
     /**
      * @param bool $endJoker
      *
-     * @return Regex
+     * @return $this
      */
     public function setEndJoker($endJoker)
     {
@@ -281,7 +281,7 @@ public function hasEndJoker()
     /**
      * @param array $replacement
      *
-     * @return Regex
+     * @return $this
      */
     public function replaceJokers($replacement)
     {

Expression/ValueInterface.php

@@ -49,14 +49,14 @@ public function getType();
     /**
      * @param string $expr
      *
-     * @return ValueInterface
+     * @return $this
      */
     public function prepend($expr);
 
     /**
      * @param string $expr
      *
-     * @return ValueInterface
+     * @return $this
      */
     public function append($expr);
 }