Merge branch 'hotfix/22'

Close #22

Author: weierophinney

.travis.yml

@@ -5,7 +5,6 @@ language: php
 cache:
   directories:
     - $HOME/.composer/cache
-    - vendor
 
 env:
   global:
@@ -20,8 +19,8 @@ matrix:
     - php: 7.1
       env:
         - DEPS=locked
-        - TEST_COVERAGE=true
         - CS_CHECK=true
+        - TEST_COVERAGE=true
     - php: 7.1
       env:
         - DEPS=latest
@@ -34,15 +33,12 @@ matrix:
     - php: 7.2
       env:
         - DEPS=latest
-  allow_failures:
-    - php: 7.2
 
 before_install:
-  - if [[ $TEST_COVERAGE != 'true' && $TRAVIS_PHP_VERSION =~ ^7.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
+  - travis_retry composer install $COMPOSER_ARGS
   - 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

LICENSE.md

@@ -1,4 +1,5 @@
 Copyright (c) 2017, Zend Technologies USA, Inc.
+
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

composer.json

@@ -1,7 +1,6 @@
 {
     "name": "zendframework/zend-expressive-hal",
     "description": "Hypertext Application Language implementation for PHP and PSR-7",
-    "type": "library",
     "license": "BSD-3-Clause",
     "keywords": [
         "expressive",
@@ -13,18 +12,25 @@
         "psr-13",
         "rest",
         "zf",
-        "zendframework"
+        "zendframework",
+        "zend-expressive"
     ],
+    "config": {
+        "sort-packages": true
+    },
+    "extra": {
+        "zf": {
+            "config-provider": "Zend\\Expressive\\Hal\\ConfigProvider"
+        }
+    },
     "support": {
         "docs": "https://docs.zendframework.com/zend-expressive-hal/",
         "issues": "https://github.com/zendframework/zend-expressive-hal/issues",
         "source": "https://github.com/zendframework/zend-expressive-hal",
+        "rss": "https://github.com/zendframework/zend-expressive-hal/releases.atom",
         "slack": "https://zendframework-slack.herokuapp.com",
         "forum": "https://discourse.zendframework.com/c/questions/expressive"
     },
-    "config": {
-        "sort-packages": true
-    },
     "require": {
         "php": "^7.1",
         "psr/http-message": "^1.0.1",
@@ -33,7 +39,7 @@
         "willdurand/negotiation": "^2.3.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.4.1",
+        "phpunit/phpunit": "^6.4.3",
         "zendframework/zend-coding-standard": "~1.0.0",
         "zendframework/zend-diactoros": "^1.6",
         "zendframework/zend-expressive-helpers": "^4.2",
@@ -59,11 +65,6 @@
             "ZendTest\\Expressive\\Hal\\": "test/"
         }
     },
-    "extra": {
-        "zf": {
-            "config-provider": "Zend\\Expressive\\Hal\\ConfigProvider"
-        }
-    },
     "scripts": {
         "check": [
             "@cs-check",

composer.lock

@@ -5,9 +5,9 @@ Zend Framework offers three support channels:
 - For real-time questions, use our
   [Slack](https://zendframework-slack.herokuapp.com)
 - For detailed questions (e.g., those requiring examples) use our
-  [forums](https://discourse.zendframework.com/c/contributors)
+  [forums](https://discourse.zendframework.com/c/questions/expressive)
 - To report issues, use this repository's
-  [issue tracker](https://github.com/{org}/{repo}/issues/new)
+  [issue tracker](https://github.com/zendframework/zend-expressive-hal/issues/new)
 
 **DO NOT** use the issue tracker to ask questions; use Slack or the forums for
 that. Questions posed to the issue tracker will be closed.