Merge branch 'hotfix/fluent-interfaces'

Close #34
zendframework · Feb 16, 2017 · 5f4c300 · 5f4c300
2 parents ee846ef + 5594292
commit 5f4c300
Show file tree

Hide file tree

Showing 10 changed files with 66 additions and 68 deletions.
diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
         "zendframework/zend-i18n": "^2.6",
         "zendframework/zend-json": "^2.6.1",
         "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-        "phpunit/PHPUnit": "^5.7 || ^6.0",
+        "phpunit/phpunit": "^5.7 || ^6.0",
         "zendframework/zend-coding-standard": "~1.0.0"
     },
     "suggest": {

diff --git a/composer.lock b/composer.lock
diff --git a/src/Config.php b/src/Config.php
@@ -324,7 +324,7 @@ public function offsetUnset($offset)
      * - Items in $merge with STRING keys will overwrite current values.
      *
      * @param  Config $merge
-     * @return Config
+     * @return self
      */
     public function merge(Config $merge)
     {

diff --git a/src/Processor/Constant.php b/src/Processor/Constant.php
@@ -49,7 +49,7 @@ public function getUserOnly()
      * Should we use only user-defined constants?
      *
      * @param  bool $userOnly
-     * @return Constant
+     * @return self
      */
     public function setUserOnly($userOnly)
     {

diff --git a/src/Processor/Filter.php b/src/Processor/Filter.php
@@ -32,7 +32,7 @@ public function __construct(ZendFilter $filter)
 
     /**
      * @param  ZendFilter $filter
-     * @return Filter
+     * @return self
      */
     public function setFilter(ZendFilter $filter)
     {