Merge branch 'feature/19' into develop

Close #19
Close #21

.travis.yml

@@ -17,11 +17,23 @@ matrix:
     - php: 5.5
       env:
         - EXECUTE_CS_CHECK=true
+    - php: 5.5
+      env:
+        - SERVICE_MANAGER_VERSION="^2.7.3"
     - php: 5.6
       env:
         - EXECUTE_TEST_COVERALLS=true
+    - php: 5.6
+      env:
+        - SERVICE_MANAGER_VERSION="^2.7.3"
     - php: 7
+    - php: 7
+      env:
+        - SERVICE_MANAGER_VERSION="^2.7.3"
     - php: hhvm 
+    - php: hhvm 
+      env:
+        - SERVICE_MANAGER_VERSION="^2.7.3"
   allow_failures:
     - php: hhvm
 
@@ -33,6 +45,8 @@ before_install:
   - if [[ $EXECUTE_TEST_COVERALLS != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
   - composer self-update
   - if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then composer require --dev --no-update satooshi/php-coveralls ; fi
+  - if [[ $SERVICE_MANAGER_VERSION != '' ]]; then composer require --dev --no-update "zendframework/zend-servicemanager:$SERVICE_MANAGER_VERSION" ; fi
+  - if [[ $SERVICE_MANAGER_VERSION == '' ]]; then composer require --dev --no-update "zendframework/zend-servicemanager:^3.0.3" ; fi
 
 install:
   - travis_retry composer install --no-interaction --ignore-platform-reqs

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 3.0.0 - TBD
+## 2.6.0 - 2016-02-04
 
 ### Added
 
@@ -18,5 +18,8 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- [#15](https://github.com/zendframework/zend-filter/pull/15) updates the
-  component to use the v3 versions of zend-servicemanager and zend-crypt.
+- [#15](https://github.com/zendframework/zend-filter/pull/15),
+  [#19](https://github.com/zendframework/zend-filter/pull/19), and
+  [#21](https://github.com/zendframework/zend-filter/pull/21)
+  update the component to be forwards-compatible with zend-servicemanager v3,
+  and reduce the number of development dependencies required for testing.

composer.json

@@ -13,24 +13,22 @@
         }
     },
     "require": {
-        "php": ">=5.5",
-        "zendframework/zend-stdlib": "~2.5"
+        "php": "^5.5 || ^7.0",
+        "zendframework/zend-stdlib": "^2.7 || ^3.0"
     },
     "require-dev": {
-        "zendframework/zend-config": "~2.5",
-        "zendframework/zend-crypt": "dev-develop as 2.7",
-        "zendframework/zend-i18n": "~2.5",
-        "zendframework/zend-loader": "~2.5",
-        "zendframework/zend-servicemanager": "dev-develop as 2.7",
-        "zendframework/zend-uri": "~2.5",
+        "pear/archive_tar": "^1.4",
+        "zendframework/zend-crypt": "^2.6",
+        "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
+        "zendframework/zend-uri": "^2.5",
         "fabpot/php-cs-fixer": "1.7.*",
         "phpunit/PHPUnit": "~4.0"
     },
     "suggest": {
-        "zendframework/zend-crypt": "Zend\\Crypt component",
-        "zendframework/zend-i18n": "Zend\\I18n component",
-        "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
-        "zendframework/zend-uri": "Zend\\Uri component for UriNormalize filter"
+        "zendframework/zend-crypt": "Zend\\Crypt component, for encryption filters",
+        "zendframework/zend-i18n": "Zend\\I18n component for filters depending on i18n functionality",
+        "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for using the filter chain functionality",
+        "zendframework/zend-uri": "Zend\\Uri component, for the UriNormalize filter"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,

src/Callback.php

@@ -25,7 +25,7 @@ class Callback extends AbstractFilter
      * @param callable|array|Traversable $callbackOrOptions
      * @param array $callbackParams
      */
-    public function __construct($callbackOrOptions, $callbackParams = [])
+    public function __construct($callbackOrOptions = [], $callbackParams = [])
     {
         if (is_callable($callbackOrOptions)) {
             $this->setCallback($callbackOrOptions);

src/File/Rename.php

@@ -34,7 +34,7 @@ class Rename extends Filter\AbstractFilter
      * @param  string|array|Traversable $options Target file or directory to be renamed
      * @throws Exception\InvalidArgumentException
      */
-    public function __construct($options)
+    public function __construct($options = [])
     {
         if ($options instanceof Traversable) {
             $options = ArrayUtils::iteratorToArray($options);

src/File/RenameUpload.php

@@ -40,7 +40,7 @@ class RenameUpload extends AbstractFilter
      *
      * @param array|string $targetOrOptions The target file path or an options array
      */
-    public function __construct($targetOrOptions)
+    public function __construct($targetOrOptions = [])
     {
         if (is_array($targetOrOptions)) {
             $this->setOptions($targetOrOptions);