Merge branch 'hotfix/25-php-7.2.-support' into develop

Forward port #25
Forward port #23

Conflicts:
	CHANGELOG.md

.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,16 +1,7 @@
-.buildpath
-.DS_Store
-.idea
-.project
-.settings/
-.*.sw*
-.*.un~
-nbproject
-doc/html/
-tmp/
-vendor/
-zf-mkdoc-theme/
-
-clover.xml
-coveralls-upload.json
-phpunit.xml
+/clover.xml
+/coveralls-upload.json
+/docs/html/
+/phpunit.xml
+/vendor/
+/zf-mkdoc-theme.tgz
+/zf-mkdoc-theme/

.travis.yml

@@ -23,14 +23,13 @@ matrix:
     - php: 5.6
       env:
         - DEPS=latest
-        - TEST_COVERAGE=true
     - php: 7
       env:
         - DEPS=lowest
     - php: 7
       env:
         - DEPS=locked
-        - CHECK_CS=true
+        - LEGACY_DEPS="phpunit/phpunit"
     - php: 7
       env:
         - DEPS=latest
@@ -40,15 +39,23 @@ matrix:
     - php: 7.1
       env:
         - DEPS=locked
+        - CS_CHECK=true
+        - TEST_COVERAGE=true
     - php: 7.1
       env:
         - DEPS=latest
-
-notifications:
-  email: false
+    - php: 7.2
+      env:
+        - DEPS=lowest
+    - php: 7.2
+      env:
+        - DEPS=locked
+    - php: 7.2
+      env:
+        - DEPS=latest
 
 before_install:
-  - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini ; fi
+  - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
 
 install:
   - travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs
@@ -59,9 +66,11 @@ install:
   - stty cols 120 && composer show
 
 script:
-  - if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; fi
-  - if [[ $TEST_COVERAGE != 'true' ]]; then composer test ; fi
-  - if [[ $CHECK_CS == 'true' ]]; then composer cs-check ; fi
+  - if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; else composer test ; fi
+  - if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi
 
 after_script:
-  - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry php ./vendor/bin/php-coveralls ; fi
+  - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry php vendor/bin/php-coveralls -v ; fi
+
+notifications:
+  email: false

CHANGELOG.md

@@ -24,15 +24,16 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
-## 2.6.1 - TBD
+## 2.6.1 - 2018-04-30
 
 ### Added
 
 - Nothing.
 
 ### Changed
 
-- Nothing.
+- [#23](https://github.com/zendframework/zend-uri/pull/23) updates the zend-validator dependency to the 2.10 series, in order to ensure that
+  this package can run under PHP 7.2.
 
 ### Deprecated
 

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-uri
 
 [![Build Status](https://secure.travis-ci.org/zendframework/zend-uri.svg?branch=master)](https://secure.travis-ci.org/zendframework/zend-uri)
-[![Coverage Status](https://coveralls.io/repos/zendframework/zend-uri/badge.svg?branch=master)](https://coveralls.io/r/zendframework/zend-uri?branch=master)
+[![Coverage Status](https://coveralls.io/repos/github/zendframework/zend-uri/badge.svg?branch=master)](https://coveralls.io/github/zendframework/zend-uri?branch=master)
 
 zend-uri aids in manipulating and validating Uniform Resource Identifiers
 ([URIs](http://www.ietf.org/rfc/rfc3986.txt)). zend-uri exists primarily to
 assist other components, such as zend-http, but is also useful as a standalone
 utility.
 
 - File issues at https://github.com/zendframework/zend-uri/issues
-- Documentation is at https://zendframework.github.io/zend-uri/
+- Documentation is at https://docs.zendframework.com/zend-uri/

composer.json

@@ -1,36 +1,47 @@
 {
     "name": "zendframework/zend-uri",
-    "description": "a component that aids in manipulating and validating \u00bb Uniform Resource Identifiers (URIs)",
+    "description": "A component that aids in manipulating and validating \u00bb Uniform Resource Identifiers (URIs)",
     "license": "BSD-3-Clause",
     "keywords": [
-        "zf2",
+        "zf",
+        "zendframework",
         "uri"
     ],
-    "homepage": "https://github.com/zendframework/zend-uri",
-    "autoload": {
-        "psr-4": {
-            "Zend\\Uri\\": "src/"
-        }
+    "support": {
+        "docs": "https://docs.zendframework.com/zend-uri/",
+        "issues": "https://github.com/zendframework/zend-uri/issues",
+        "source": "https://github.com/zendframework/zend-uri",
+        "rss": "https://github.com/zendframework/zend-uri/releases.atom",
+        "chat": "https://zendframework-slack.herokuapp.com",
+        "forum": "https://discourse.zendframework.com/c/questions/components"
     },
     "require": {
         "php": "^5.6 || ^7.0",
         "zendframework/zend-escaper": "^2.5",
-        "zendframework/zend-validator": "^2.5"
+        "zendframework/zend-validator": "^2.10"
     },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.6.x-dev",
-            "dev-develop": "2.7.x-dev"
+    "require-dev": {
+        "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
+        "zendframework/zend-coding-standard": "~1.0.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Zend\\Uri\\": "src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
             "ZendTest\\Uri\\": "test/"
         }
     },
-    "require-dev": {
-        "phpunit/phpunit": "^6.2.1 || ^5.7.15",
-        "zendframework/zend-coding-standard": "~1.0.0"
+    "config": {
+        "sort-packages": true
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.6.x-dev",
+            "dev-develop": "2.7.x-dev"
+        }
     },
     "scripts": {
         "check": [

CONDUCT.md → docs/CODE_OF_CONDUCT.md

@@ -1,6 +1,6 @@
 # Contributor Code of Conduct
 
-The Zend Framework project adheres to [The Code Manifesto](http://codemanifesto.com)
+This project adheres to [The Code Manifesto](http://codemanifesto.com)
 as its guidelines for contributor interactions.
 
 ## The Code Manifesto