Merge branch 'hotfix/qa-tools' into develop

Forward port #139
Forward port #142
Forward port #143
Forward port #144
Forward port #145

Author: weierophinney

.gitattributes

@@ -1,8 +1,10 @@
-/doc export-ignore
-/test export-ignore
-.gitattributes export-ignore
-.gitignore export-ignore
-.travis.yml export-ignore
-mkdocs.yml export-ignore
-phpcs.xml 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,7 +1,7 @@
-doc/html/
-vendor/
-phpunit.xml
-zf-mkdoc-theme/
-clover.xml
-coveralls-upload.json
-zf-mkdoc-theme.tgz
+/clover.xml
+/coveralls-upload.json
+/docs/html/
+/phpunit.xml
+/vendor/
+/zf-mkdoc-theme.tgz
+/zf-mkdoc-theme/

.travis.yml

@@ -2,19 +2,14 @@ sudo: false
 
 language: php
 
-branches:
-  except:
-    - /^release-.*$/
-    - /^ghgfk-.*$/
 cache:
   directories:
     - $HOME/.composer/cache
 
 env:
   global:
     - COMPOSER_ARGS="--no-interaction"
-    - COVERAGE_DEPS="satooshi/php-coveralls"
-    - LEGACY_DEPS="phpunit/phpunit"
+    - COVERAGE_DEPS="php-coveralls/php-coveralls"
     - TESTS_ZEND_HTTP_CLIENT_ONLINE=true
 
 matrix:
@@ -25,8 +20,7 @@ matrix:
     - php: 5.6
       env:
         - DEPS=locked
-        - CS_CHECK=true
-        - TEST_COVERAGE=true
+        - LEGACY_DEPS="phpunit/phpunit"
     - php: 5.6
       env:
         - DEPS=latest
@@ -36,6 +30,7 @@ matrix:
     - php: 7
       env:
         - DEPS=locked
+        - LEGACY_DEPS="phpunit/phpunit"
     - php: 7
       env:
         - DEPS=latest
@@ -45,6 +40,8 @@ matrix:
     - php: 7.1
       env:
         - DEPS=locked
+        - CS_CHECK=true
+        - TEST_COVERAGE=true
     - php: 7.1
       env:
         - DEPS=latest
@@ -57,16 +54,13 @@ matrix:
     - php: 7.2
       env:
         - DEPS=latest
-  allow_failures:
-    - php: 7.2
 
 before_install:
-  - if [[ $TEST_COVERAGE != 'true' && "$(php --version | grep xdebug -ci)" -ge 1 ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
-  - travis_retry composer self-update
+  - 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 [[ $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
@@ -77,7 +71,7 @@ script:
   - if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi
 
 after_script:
-  - if [[ $TEST_COVERAGE == 'true' ]]; then composer upload-coverage ; fi
+  - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry php vendor/bin/php-coveralls -v ; fi
 
 notifications:
   email: false

CHANGELOG.md

@@ -24,6 +24,10 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Added
 
+- [#143](https://github.com/zendframework/zend-http/pull/143) adds support for PHP 7.2.
+
+### Changed
+
 - Nothing.
 
 ### Deprecated
@@ -117,7 +121,7 @@ All notable changes to this project will be documented in this file, in reverse
   Security Policy CSP HTTP header when it is `none` (empty value).
 - [#92](https://github.com/zendframework/zend-http/pull/92) fixes the flatten
   cookies value for array value (also multidimensional).
-- [#34](https://github.com/zendframework/zend-http/issues/33) fixes the
+- [#34](https://github.com/zendframework/zend-http/pull/34) fixes the
   standard separator (&) for application/x-www-form-urlencoded.
 
 ## 2.5.5 - 2016-08-08

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,7 +1,7 @@
 # zend-http
 
 [![Build Status](https://secure.travis-ci.org/zendframework/zend-http.svg?branch=master)](https://secure.travis-ci.org/zendframework/zend-http)
-[![Coverage Status](https://coveralls.io/repos/zendframework/zend-http/badge.svg?branch=master)](https://coveralls.io/r/zendframework/zend-http?branch=master)
+[![Coverage Status](https://coveralls.io/repos/github/zendframework/zend-http/badge.svg?branch=master)](https://coveralls.io/github/zendframework/zend-http?branch=master)
 
 zend-http provides the HTTP message abstraction used by
 [zend-mvc](https://docs.zendframework.com/zend-mvc/), and also provides an
@@ -12,4 +12,4 @@ it predates that specification. For PSR-7 support, please see our
 [Diactoros component](https://docs.zendframework.com/zend-diactoros/).
 
 - File issues at https://github.com/zendframework/zend-http/issues
-- Documentation is at https://zendframework.github.io/zend-http/
+- Documentation is at https://docs.zendframework.com/zend-http/

composer.json

@@ -1,7 +1,6 @@
 {
     "name": "zendframework/zend-http",
-    "description": "provides an easy interface for performing Hyper-Text Transfer Protocol (HTTP) requests",
-    "homepage": "https://github.com/zendframework/zend-http",
+    "description": "Provides an easy interface for performing Hyper-Text Transfer Protocol (HTTP) requests",
     "license": "BSD-3-Clause",
     "keywords": [
         "zf",
@@ -11,16 +10,13 @@
         "HTTP client"
     ],
     "support": {
-        "docs": "https://docs.zendframework.com/zend-http",
+        "docs": "https://docs.zendframework.com/zend-http/",
         "issues": "https://github.com/zendframework/zend-http/issues",
         "source": "https://github.com/zendframework/zend-http",
         "rss": "https://github.com/zendframework/zend-http/releases.atom",
-        "slack": "https://zendframework-slack.herokuapp.com",
+        "chat": "https://zendframework-slack.herokuapp.com",
         "forum": "https://discourse.zendframework.com/c/questions/components"
     },
-    "config": {
-        "sort-packages": true
-    },
     "require": {
         "php": "^5.6 || ^7.0",
         "zendframework/zend-loader": "^2.5.1",
@@ -29,7 +25,7 @@
         "zendframework/zend-validator": "^2.10.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.4.1 || ^5.7.15",
+        "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.3",
         "zendframework/zend-coding-standard": "~1.0.0",
         "zendframework/zend-config": "^3.1 || ^2.6"
     },
@@ -43,10 +39,13 @@
             "ZendTest\\Http\\": "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"
         }
     },
     "scripts": {
@@ -57,7 +56,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"
     }
 }