Merging develop to master in preparation for 2.8.0 release

Author: weierophinney

.gitattributes

@@ -1,8 +1,10 @@
-/test export-ignore
-/vendor export-ignore
-.coveralls.yml export-ignore
-.gitattributes export-ignore
-.gitignore export-ignore
-.travis.yml export-ignore
-.php_cs export-ignore
-phpunit.xml.dist export-ignore
+/.coveralls.yml export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/.travis.yml export-ignore
+/composer.lock export-ignore
+/docs/ export-ignore
+/mkdocs.yml export-ignore
+/phpcs.xml export-ignore
+/phpunit.xml.dist export-ignore
+/test/ export-ignore

.gitignore

@@ -1,17 +1,7 @@
-.buildpath
-.DS_Store
-.idea
-.project
-.settings/
-.*.sw*
-.*.un~
-nbproject
-doc/html/
-tmp/
-zf-mkdoc-theme/
-
-clover.xml
-composer.lock
-coveralls-upload.json
-phpunit.xml
-vendor
+/clover.xml
+/coveralls-upload.json
+/docs/html/
+/phpunit.xml
+/vendor/
+/zf-mkdoc-theme.tgz
+/zf-mkdoc-theme/

.travis.yml

@@ -2,92 +2,75 @@ sudo: false
 
 language: php
 
-branches:
-  except:
-    - /^release-.*$/
-    - /^ghgfk-.*$/
-
 cache:
   directories:
     - $HOME/.composer/cache
-    - $HOME/.local
-    - zf-mkdoc-theme
 
 env:
   global:
     - COMPOSER_ARGS="--no-interaction"
-    - COVERAGE_DEPS="satooshi/php-coveralls"
-    - CRYPT_DEPS="zendframework/zend-crypt:^3.0"
-    - LEGACY_DEPS="phpunit/phpunit"
-    - SITE_URL: https://zendframework.github.io/zend-filter
-    - GH_USER_NAME: "Matthew Weier O'Phinney"
-    - GH_USER_EMAIL: matthew@weierophinney.net
-    - GH_REF: github.com/zendframework/zend-filter.git
-    - secure: "ciAQTsLfrenD7WuLrZb0mzeqYj0JfxIGDleAH6iI0fopm+HrSyitr9aDlZzc1UsWx+9CCkajuV4bmXCarCTSGOAQ8U7NqSujKawyWRWO3M/yN2gCTBeZyZcGaj/GgnOHX2AgNibdpe1ZNaNlAKEd0s1F016SoEYMdN9JuzbSRAfP17VVQ87IAm8LegPJdJrMz7reLW7khl+YXEnYiEdW4hNmMMcN1apGfxlQ/X3dXTt3GIX5F6i14dfGzQqkwFFMBJAkJ6zUXj+mmOWimVXJ8mfSINBwIATM9QWLtgQoDvwUUXNEePk6Lrncc+O83T3dG+SMlmC3loTnMtyzutm9m9Rmo0gAXhzefmiVj8uK6QZMgXcu3MZjKW5GDVHSeGK/BOGagpIm6DvPRluDRDviPYk5uTUdKrrDDlZZ1jQZqqzLE/pyyJPKQ3T7ao1QZWjZ0skj0zy97Qjmx/HP5dsBMIz/WgBkoovKsMvhINZw0CIqv0veOGKNkdjesmQapcJGNLZ3df7DuFWU328QbfeIpptceuhhry32DeAz1i4zdNLD92hPGhjVmKjpwdS0GuOUAIeiK8rfFu6lQ74Kcu7pRdS8hkuqGYamrz8msNZsEc909um4TVPUdzd4aQcepghYboUpVlwNzopPK06Fx1wYMbwTzQzM7jS7YBX+FckPJJc="
+    - COVERAGE_DEPS="php-coveralls/php-coveralls"
 
 matrix:
   include:
     - php: 5.6
       env:
         - DEPS=lowest
+    - php: 5.6
+      env:
+        - DEPS=locked
+        - LEGACY_DEPS="phpunit/phpunit"
     - php: 5.6
       env:
         - DEPS=latest
-        - TEST_COVERAGE=true
-        - DEPLOY_DOCS="$(if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then echo -n 'true' ; else echo -n 'false' ; fi)"
-        - PATH="$HOME/.local/bin:$PATH"
     - php: 7
       env:
         - DEPS=lowest
+    - php: 7
+      env:
+        - DEPS=locked
+        - LEGACY_DEPS="phpunit/phpunit"
     - php: 7
       env:
         - DEPS=latest
-        - CS_CHECK=true
     - php: 7.1
       env:
         - DEPS=lowest
+    - php: 7.1
+      env:
+        - DEPS=locked
+        - CS_CHECK=true
+        - TEST_COVERAGE=true
     - php: 7.1
       env:
         - DEPS=latest
-    - php: hhvm
+    - php: 7.2
       env:
         - DEPS=lowest
-    - php: hhvm
+    - php: 7.2
+      env:
+        - DEPS=locked
+    - php: 7.2
       env:
         - DEPS=latest
-  allow_failures:
-    - php: hhvm
 
 before_install:
-  - travis_retry composer self-update
-  - if [[ $TRAVIS_PHP_VERSION != "hhvm" && $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini ; fi
-  - composer validate
+  - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
 
 install:
   - travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs
-  - if [[ $TRAVIS_PHP_VERSION =~ ^5.6 ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi
-  - if [[ $TRAVIS_PHP_VERSION =~ ^7.1 ]]; then travis_retry composer require $COMPOSER_ARGS --update-with-dependencies $CRYPT_DEPS ; fi
+  - if [[ $LEGACY_DEPS != '' ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi
   - if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
   - if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
   - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
-  - stty cols 120
-  - COLUMNS=120 composer show
+  - stty cols 120 && composer show
 
 script:
   - if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; else composer test ; fi
   - if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi
-  - if [[ $DEPLOY_DOCS == "true" && "$TRAVIS_TEST_RESULT" == "0" ]]; then wget -O theme-installer.sh "https://raw.githubusercontent.com/zendframework/zf-mkdoc-theme/master/theme-installer.sh" ; chmod 755 theme-installer.sh ; ./theme-installer.sh ; fi
-
-after_success:
-  - if [[ $DEPLOY_DOCS == "true" ]]; then echo "Preparing to build and deploy documentation" ; ./zf-mkdoc-theme/deploy.sh ; echo "Completed deploying documentation" ; fi
 
 after_script:
-  - if [[ $TEST_COVERAGE == 'true' ]]; then composer upload-coverage ; fi
+  - if [[ $TEST_COVERAGE == 'true' ]]; then vendor/bin/php-coveralls -v ; fi
 
 notifications:
   email: false
-  slack:
-    rooms:
-      - secure: "N9n2yGM73arOVGnQ45sCT/Y1sbrQd6E8PGj9IJvqj5OJDoUU88cPmtjssM+LO6UoZb6hzYJCkhV+PmasxzQw++iluyTGJk0KUEfQMIACsyewogXcFKoH5/s9M9PrdPqgmewK3AS3HyeD+hDqmZtfjGx75Je03C0idyZ4r/uvd+7l/m+6naIS4a8zwHd0Um6Y5MstLdieAKxyfHRaxvJf34UN1S2wxbIczsg75FzKYCCK34p6bvzje8w+jkdKbFVsPngxlScGdDvlfeNGl1DuC+RO7UFPwS1g9RxDFavy+XpC4uwSXTsmbzs8IkLErtilK36OSCPXRUrwtVN6NjlbAVZclKGersf0fks0eLHfEKsVEM5RozxzusHN3z/iG9ZIv/qHRSwf9cOpi2NrvfAWjzs/jJTCwDgOXEMgFsO3ROY1EA5X9z7QSNzjLi7rPf63gOpZL+dHEI0Tg5Xmec+xrRNH4Sq2mt6TknEhr8AMSA9qti2PO/dbvcyc99qj02rkWbHNCAqPGa77FMB1+Il95hE6Qzrxa7yU1aU5pJKX9OSZq+XuC9khynibL7X9ji55IZnc+DeGyi5QVLvlpSWNuwWONib41h+8DL+bqmUsxFytAQRIKTKfeDm7VbLBGgQMEsr8HMZZj3D9P5Hkys4EWTVVwiliW14/ctyFM9xO/cg="
-    on_success: change
-    on_failure: always

CHANGELOG.md

@@ -2,6 +2,41 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 2.8.0 - TBD
+
+### Added
+
+- [#26](https://github.com/zendframework/zend-filter/pull/26) adds the interface
+  `Zend\Filter\FilterProviderInterface`, which can be used to provide
+  configuration for the `FilterPluginManager` via zend-mvc `Module` classes.
+
+- [#61](https://github.com/zendframework/zend-filter/pull/61) adds support for
+  PHP 7.2.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- [#61](https://github.com/zendframework/zend-filter/pull/61) removes support
+  for PHP 5.5.
+
+- [#61](https://github.com/zendframework/zend-filter/pull/61) removes support
+  for HHVM.
+
+- [#61](https://github.com/zendframework/zend-filter/pull/61) removes support
+  for zend-crypt versions prior to 3.0. This was done as PHP deprecated the
+  mcrypt extension starting in PHP 7.1, and does not ship it by default
+  starting in PHP 7.2. zend-crypt 3.0 adds an OpenSSL adapter for its
+  BlockCipher capabilities, and acts as a polyfill for mcrypt usage. Since this
+  functionality has been used by default since 2.7.2, users should be able to
+  upgrade seamlessly.
+
+### Fixed
+
+- Nothing.
+
 ## 2.7.3 - TBD
 
 ### Added

LICENSE.md

@@ -1,16 +1,15 @@
-Copyright (c) 2005-2015, Zend Technologies USA, Inc.
-
+Copyright (c) 2005-2018, Zend Technologies USA, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
 
-- Redistributions of source code must retain the above copyright notice,
-  this list of conditions and the following disclaimer.
+- Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
 
-- Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
+- Redistributions in binary form must reproduce the above copyright notice, this
+  list of conditions and the following disclaimer in the documentation and/or
+  other materials provided with the distribution.
 
 - Neither the name of Zend Technologies USA, Inc. nor the names of its
   contributors may be used to endorse or promote products derived from this

README.md

@@ -1,12 +1,12 @@
 # zend-filter
 
 [![Build Status](https://secure.travis-ci.org/zendframework/zend-filter.svg?branch=master)](https://secure.travis-ci.org/zendframework/zend-filter)
-[![Coverage Status](https://coveralls.io/repos/zendframework/zend-filter/badge.svg?branch=master)](https://coveralls.io/r/zendframework/zend-filter?branch=master)
+[![Coverage Status](https://coveralls.io/repos/github/zendframework/zend-filter/badge.svg?branch=master)](https://coveralls.io/github/zendframework/zend-filter?branch=master)
 
 The `Zend\Filter` component provides a set of commonly needed data filters. It
 also provides a simple filter chaining mechanism by which multiple filters may
 be applied to a single datum in a user-defined order.
 
 
 - File issues at https://github.com/zendframework/zend-filter/issues
-- Documentation is at https://zendframework.github.io/zend-filter/
+- Documentation is at https://docs.zendframework.com/zend-filter/

composer.json

@@ -3,50 +3,62 @@
     "description": "provides a set of commonly needed data filters",
     "license": "BSD-3-Clause",
     "keywords": [
-        "zf2",
+        "zf",
+        "zendframework",
         "filter"
     ],
-    "homepage": "https://github.com/zendframework/zend-filter",
-    "autoload": {
-        "psr-4": {
-            "Zend\\Filter\\": "src/"
-        }
+    "support": {
+        "docs": "https://docs.zendframework.com/zend-filter/",
+        "issues": "https://github.com/zendframework/zend-filter/issues",
+        "source": "https://github.com/zendframework/zend-filter",
+        "rss": "https://github.com/zendframework/zend-filter/releases.atom",
+        "slack": "https://zendframework-slack.herokuapp.com",
+        "forum": "https://discourse.zendframework.com/c/questions/components"
     },
     "require": {
-        "php": "^5.5 || ^7.0",
-        "zendframework/zend-stdlib": "^2.7 || ^3.0"
+        "php": "^5.6 || ^7.0",
+        "zendframework/zend-stdlib": "^2.7.7 || ^3.1"
     },
     "require-dev": {
-        "pear/archive_tar": "^1.4",
-        "zendframework/zend-crypt": "^2.6 || ^3.0",
-        "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-        "zendframework/zend-uri": "^2.5",
-        "phpunit/PHPUnit": "^6.0.10 || ^5.7.17",
-        "zendframework/zend-coding-standard": "~1.0.0"
+        "pear/archive_tar": "^1.4.3",
+        "phpunit/phpunit": "^5.7.23 || ^6.4.3",
+        "zendframework/zend-coding-standard": "~1.0.0",
+        "zendframework/zend-crypt": "^3.2.1",
+        "zendframework/zend-servicemanager": "^2.7.8 || ^3.3",
+        "zendframework/zend-uri": "^2.6"
     },
     "suggest": {
         "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,
+    "conflict": {
+        "zendframework/zend-validator": "<2.10.1"
+    },
+    "autoload": {
+        "psr-4": {
+            "Zend\\Filter\\": "src/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "ZendTest\\Filter\\": "test/"
+        }
+    },
+    "config": {
+        "sort-packages": true
+    },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.7-dev",
-            "dev-develop": "2.8-dev"
+            "dev-master": "2.7.x-dev",
+            "dev-develop": "2.8.x-dev"
         },
         "zf": {
             "component": "Zend\\Filter",
             "config-provider": "Zend\\Filter\\ConfigProvider"
         }
     },
-    "autoload-dev": {
-        "psr-4": {
-            "ZendTest\\Filter\\": "test/"
-        }
-    },
     "scripts": {
         "check": [
             "@cs-check",
@@ -55,7 +67,6 @@
         "cs-check": "phpcs",
         "cs-fix": "phpcbf",
         "test": "phpunit --colors=always",
-        "test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
-        "upload-coverage": "coveralls -v"
+        "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
     }
 }