Merge branch 'hotfix/qa-tools-and-branches' into develop

Forward port #40
Forward port #44

Author: weierophinney

.gitattributes

@@ -1,10 +1,10 @@
-/test export-ignore
-.coveralls.yml
-.gitattributes export-ignore
-.gitignore export-ignore
-.travis.yml export-ignore
-phpcs.xml export-ignore
-.docheader export-ignore
-CONDUCT.md export-ignore
-CONTRIBUTING.md export-ignore
-phpunit.xml.dist export-ignore
+/.coveralls.yml export-ignore
+/.docheader export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/.travis.yml export-ignore
+/composer.lock export-ignore
+/docs/ export-ignore
+/phpcs.xml export-ignore
+/phpunit.xml.dist export-ignore
+/test/ export-ignore

.gitignore

@@ -1,4 +1,4 @@
-vendor/
-phpunit.xml
-clover.xml
-coveralls-upload.json
+/clover.xml
+/coveralls-upload.json
+/phpunit.xml
+/vendor/

.travis.yml

@@ -5,14 +5,11 @@ language: php
 cache:
   directories:
     - $HOME/.composer/cache
-    - $HOME/.local
-    - vendor
 
 env:
   global:
     - COMPOSER_ARGS="--no-interaction"
     - COVERAGE_DEPS="satooshi/php-coveralls"
-    - LEGACY_DEPS="phpunit/phpunit"
 
 matrix:
   include:
@@ -22,14 +19,16 @@ matrix:
     - php: 5.6
       env:
         - DEPS=locked
-        - TEST_COVERAGE=true
+        - LEGACY_DEPS="phpunit/phpunit"
     - php: 5.6
       env:
         - DEPS=locked
+        - LEGACY_DEPS="phpunit/phpunit"
         - HELPER_DEPS="zendframework/zend-expressive-helpers:^2.2 zendframework/zend-expressive-router:^1.3.2"
     - php: 5.6
       env:
         - DEPS=locked
+        - LEGACY_DEPS="phpunit/phpunit"
         - HELPER_DEPS="zendframework/zend-expressive-helpers:^3.0.1"
     - php: 5.6
       env:
@@ -40,14 +39,16 @@ matrix:
     - php: 7
       env:
         - DEPS=locked
-        - CS_CHECK=true
+        - LEGACY_DEPS="phpunit/phpunit"
     - php: 7
       env:
         - DEPS=locked
+        - LEGACY_DEPS="phpunit/phpunit"
         - HELPER_DEPS="zendframework/zend-expressive-helpers:^2.2 zendframework/zend-expressive-router:^1.3.2"
     - php: 7
       env:
         - DEPS=locked
+        - LEGACY_DEPS="phpunit/phpunit"
         - HELPER_DEPS="zendframework/zend-expressive-helpers:^3.0.1"
     - php: 7
       env:
@@ -58,6 +59,8 @@ matrix:
     - php: 7.1
       env:
         - DEPS=locked
+        - CS_CHECK=true
+        - TEST_COVERAGE=true
     - php: 7.1
       env:
         - DEPS=locked
@@ -69,38 +72,35 @@ matrix:
     - php: 7.1
       env:
         - DEPS=latest
-    - php: hhvm
+    - php: 7.2
       env:
         - DEPS=lowest
-    - php: hhvm
+    - php: 7.2
       env:
         - DEPS=locked
-    - php: hhvm
+    - php: 7.2
       env:
         - DEPS=locked
         - HELPER_DEPS="zendframework/zend-expressive-helpers:^2.2 zendframework/zend-expressive-router:^1.3.2"
-    - php: hhvm
+    - php: 7.2
       env:
         - DEPS=locked
         - HELPER_DEPS="zendframework/zend-expressive-helpers:^3.0.1"
-    - php: hhvm
+    - php: 7.2
       env:
         - DEPS=latest
-  allow_failures:
-    - php: hhvm
 
 before_install:
   - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
-  - travis_retry composer self-update
 
 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 [[ $HELPER_DEPS != '' ]]; then travis_retry composer require $COMPOSER_ARGS --update-with-dependencies $HELPER_DEPS ; fi
   - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
-  - composer show
+  - stty cols 120 && composer show
 
 script:
   - if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; else composer test ; fi
@@ -112,13 +112,3 @@ after_script:
 
 notifications:
   email: false
-  irc:
-    channels:
-      - "irc.freenode.org#zftalk.dev"
-    on_success: change
-    on_failure: always
-  slack:
-    rooms:
-      - secure: "e6NSTxYfduEBE4M4ywNmlzWSA1WP/dl5KAsjkQZjKAQMYKNZZ4H6amNF3fyfoq9m8z/oozJYCGPzHwVAnOkK2dr8m3Kv9dfk6T8EeB9o55uBEevwlnqIX48Ls+IKI1ZbTu1+hrUkDRGhIRoEdzDXQR0iBD7bE1TyRvWCoaBTyH4XhOboDJEC+ohVC3TO/uAtvrwpCuZ6U1blUeh+XNy79TrWVoO0erQc/UdNcee8688iUqNHGN7Ds35x/vYuvZnNWrqVH0nW6SUst4KQwFMV25X8LuPd6ZU4NhCog2Q5kZoq+Dw/o7Umdn3qqnjT9sgcDIwdEtb2LYr66nM4fdRe/ueH7EgxSd0x6bBDdSccgj7dNytTD8wh70gLmiKxOK5oomBtVb6XF3dmVzRtY/GMzAXjg7SMWDrqxXU7VXBovENz/nS3AWW+2hOIazkbumq1oDXA/KSFgMEOG40yfRHohOkB0h9CQOypPmnm7G5T4Dn3Zwvkqltrz4YFTtSUflgxl97OQsnwJdCUY7NxZusY4vrrlqGzFvwago5kpFRbBzONaHh5qmIX9KKeCDiITjIV5UO9yZLSQyZCR74THn0TJ2CfcCnW4vKbOHAPVgZRd/XS5JxvxAxN6kozl+4YC33ZJEDSlWMS4C7AxJ0MR/Vu4o93rQxAMqJ1L1Y56adEeBw="
-    on_success: change
-    on_failure: always

LICENSE.md

@@ -1,16 +1,15 @@
 Copyright (c) 2015-2017, 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-view PhpRenderer Integration for Expressive
 
 [![Build Status](https://secure.travis-ci.org/zendframework/zend-expressive-zendviewrenderer.svg?branch=master)](https://secure.travis-ci.org/zendframework/zend-expressive-zendviewrenderer)
-[![Coverage Status](https://coveralls.io/repos/zendframework/zend-expressive-zendviewrenderer/badge.svg?branch=master)](https://coveralls.io/r/zendframework/zend-expressive-zendviewrenderer?branch=master)
+[![Coverage Status](https://coveralls.io/repos/github/zendframework/zend-expressive-zendviewrenderer/badge.svg?branch=master)](https://coveralls.io/github/zendframework/zend-expressive-zendviewrenderer?branch=master)
 
 [zend-view PhpRenderer](https://github.com/zendframework/zend-view) integration
 for [Expressive](https://github.com/zendframework/zend-expressive).

composer.json

@@ -1,21 +1,23 @@
 {
     "name": "zendframework/zend-expressive-zendviewrenderer",
     "description": "zend-view PhpRenderer integration for Expressive",
-    "type": "library",
     "license": "BSD-3-Clause",
     "keywords": [
         "expressive",
         "http",
         "middleware",
         "psr",
         "psr-7",
-        "zf"
+        "zf",
+        "zendframework",
+        "zend-expressive"
     ],
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.4-dev",
-            "dev-develop": "1.5-dev"
-        }
+    "support": {
+        "issues": "https://github.com/zendframework/zend-expressive-zendviewrenderer/issues",
+        "source": "https://github.com/zendframework/zend-expressive-zendviewrenderer",
+        "rss": "https://github.com/zendframework/zend-expressive-zendviewrenderer/releases.atom",
+        "slack": "https://zendframework-slack.herokuapp.com",
+        "forum": "https://discourse.zendframework.com/c/questions/expressive"
     },
     "require": {
         "php": "^5.6 || ^7.0",
@@ -29,30 +31,40 @@
     },
     "require-dev": {
         "malukenho/docheader": "^0.1.5",
-        "phpunit/phpunit": "^6.0.8 || ^5.7.15",
+        "phpunit/phpunit": "^5.7.23 || ^6.4.3",
         "zendframework/zend-coding-standard": "~1.0.0"
     },
     "autoload": {
-      "psr-4": {
-        "Zend\\Expressive\\ZendView\\": "src/"
-      }
+        "psr-4": {
+            "Zend\\Expressive\\ZendView\\": "src/"
+        }
     },
     "autoload-dev": {
-      "psr-4": {
-        "ZendTest\\Expressive\\ZendView\\": "test/"
-      }
+        "psr-4": {
+            "ZendTest\\Expressive\\ZendView\\": "test/"
+        }
+    },
+    "config": {
+        "sort-packages": true
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.4.x-dev",
+            "dev-develop": "1.5.x-dev",
+            "dev-release-2.0.0": "2.0.x-dev"
+        }
     },
     "scripts": {
         "check": [
             "@license-check",
             "@cs-check",
             "@test"
         ],
-        "upload-coverage": "coveralls -v",
-        "cs-check": "phpcs --colors",
-        "cs-fix": "phpcbf --colors",
-        "license-check": "docheader check src/ test/",
+        "cs-check": "phpcs",
+        "cs-fix": "phpcbf",
         "test": "phpunit --colors=always",
-        "test-coverage": "phpunit --coverage-clover clover.xml"
+        "test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
+        "upload-coverage": "coveralls -v",
+        "license-check": "docheader check src/ test/"
     }
 }