Merge 7330d4e into f52af41

.gitattributes

@@ -1,7 +1,9 @@
-/test export-ignore
-.coveralls.yml
-.gitattributes export-ignore
-.gitignore export-ignore
-.travis.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
+/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,13 +5,11 @@ language: php
 cache:
   directories:
     - $HOME/.composer/cache
-    - vendor
 
 env:
   global:
     - COMPOSER_ARGS="--no-interaction"
-    - COVERAGE_DEPS="satooshi/php-coveralls"
-    - LEGACY_DEPS="phpunit/phpunit"
+    - COVERAGE_DEPS="php-coveralls/php-coveralls"
 
 matrix:
   include:
@@ -21,7 +19,7 @@ matrix:
     - php: 5.6
       env:
         - DEPS=locked
-        - TEST_COVERAGE=true
+        - LEGACY_DEPS="phpunit/phpunit"
     - php: 5.6
       env:
         - DEPS=latest
@@ -31,7 +29,7 @@ matrix:
     - php: 7
       env:
         - DEPS=locked
-        - CS_CHECK=true
+        - LEGACY_DEPS="phpunit/phpunit"
     - php: 7
       env:
         - DEPS=latest
@@ -41,30 +39,27 @@ matrix:
     - 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: hhvm
+    - php: 7.2
       env:
         - DEPS=latest
-  allow_failures:
-    - php: hhvm
-
-notifications:
-  email: false
 
 before_install:
-  - if [[ $TEST_COVERAGE != 'true' && "$(php --version | grep xdebug -ci)" -ge 1 ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
+  - 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
@@ -75,4 +70,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

@@ -6,7 +6,7 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Added
 
-- Nothing.
+- [#103](https://github.com/zfcampus/zf-content-negotiation/pull/103) adds support for PHP 7.2.
 
 ### Changed
 
@@ -18,7 +18,7 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Removed
 
-- Nothing.
+- [#103](https://github.com/zfcampus/zf-content-negotiation/pull/103) removes support for HHVM.
 
 ### Fixed
 

LICENSE.md

@@ -1,16 +1,15 @@
-Copyright (c) 2014-2016, Zend Technologies USA, Inc.
-
+Copyright (c) 2014-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,11 +1,9 @@
-ZF Content Negotiation
-======================
+# ZF Content Negotiation
 
-[![Build Status](https://travis-ci.org/zfcampus/zf-content-negotiation.svg?branch=master)](https://travis-ci.org/zfcampus/zf-content-negotiation)
+[![Build Status](https://secure.travis-ci.org/zfcampus/zf-content-negotiation.svg?branch=master)](https://secure.travis-ci.org/zfcampus/zf-content-negotiation)
 [![Coverage Status](https://coveralls.io/repos/github/zfcampus/zf-content-negotiation/badge.svg?branch=master)](https://coveralls.io/github/zfcampus/zf-content-negotiation?branch=master)
 
-Introduction
-------------
+## Introduction
 
 `zf-content-negotiation` is a module for automating content negotiation tasks within a Zend
 Framework application.
@@ -21,13 +19,11 @@ The following features are provided
   bodies with `Content-Type` media types that fall outside the whitelist will be
   immediately rejected with a `415 Unsupported Media Type` response.
 
-Requirements
-------------
+## Requirements
 
 Please see the [composer.json](composer.json) file.
 
-Installation
-------------
+## Installation
 
 Run the following `composer` command:
 
@@ -64,8 +60,7 @@ return [
 > If you use [zf-component-installer](https://github.com/zendframework/zf-component-installer),
 > that plugin will install zf-content-negotiation as a module for you.
 
-Configuration
--------------
+## Configuration
 
 ### User Configuration
 
@@ -288,8 +283,7 @@ function:
 ],
 ```
 
-ZF2 Events
-----------
+## ZF Events
 
 ### Listeners
 
@@ -331,8 +325,7 @@ header is present, and, if so, if it contains a value in the set allowed for the
 current HTTP request method invoked. If so, it resets the HTTP request method to
 the header value.
 
-ZF2 Services
-------------
+## ZF Services
 
 ### Controller Plugins
 

composer.json

@@ -1,45 +1,35 @@
 {
     "name": "zfcampus/zf-content-negotiation",
-    "description": "ZF2 Module providing content-negotiation features",
-    "type": "library",
+    "description": "ZF Module providing content-negotiation features",
     "license": "BSD-3-Clause",
     "keywords": [
-        "zf2",
-        "zend",
+        "zf",
+        "zendframework",
         "module",
         "content-negotiation"
     ],
-    "homepage": "http://apigility.org/",
     "support": {
-        "irc": "irc://irc.freenode.net/apigility",
+        "issues": "https://github.com/zfcampus/zf-content-negotiation/issues",
         "source": "https://github.com/zfcampus/zf-content-negotiation",
-        "issues": "https://github.com/zfcampus/zf-content-negotiation/issues"
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.3-dev",
-            "dev-develop": "1.4-dev"
-        },
-        "zf": {
-            "module": "ZF\\ContentNegotiation"
-        }
+        "rss": "https://github.com/zfcampus/zf-content-negotiation/releases.atom",
+        "chat": "https://zendframework-slack.herokuapp.com",
+        "forum": "https://discourse.zendframework.com/c/questions/apigility"
     },
     "require": {
         "php": "^5.6 || ^7.0",
         "zendframework/zend-eventmanager": "^2.6.3 || ^3.0.1",
         "zendframework/zend-filter": "^2.7.1",
         "zendframework/zend-http": "^2.5.4",
         "zendframework/zend-json": "^2.6.1 || ^3.0",
-        "zendframework/zend-mvc": "^2.7.9 || ^3.0.2",
+        "zendframework/zend-mvc": "^2.7.15 || ^3.0.2",
         "zendframework/zend-servicemanager": "^2.7.6 || ^3.1",
         "zendframework/zend-stdlib": "^2.7.7 || ^3.0.1",
         "zendframework/zend-validator": "^2.8.1",
         "zendframework/zend-view": "^2.8.1",
         "zfcampus/zf-api-problem": "^1.2.1"
     },
     "require-dev": {
-        "phpunit/PHPUnit": "^4.8",
-        "squizlabs/php_codesniffer": "^2.7",
+        "phpunit/PHPUnit": "^5.7.27 || ^6.5.8 || ^7.1.5",
         "zendframework/zend-coding-standard": "~1.0.0",
         "zendframework/zend-console": "^2.0",
         "zfcampus/zf-hal": "^1.4"
@@ -57,15 +47,26 @@
             "ZFTest\\ContentNegotiation\\": "test/"
         }
     },
+    "config": {
+        "sort-packages": true
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.3.x-dev",
+            "dev-develop": "1.4.x-dev"
+        },
+        "zf": {
+            "module": "ZF\\ContentNegotiation"
+        }
+    },
     "scripts": {
         "check": [
             "@cs-check",
             "@test"
         ],
-        "upload-coverage": "coveralls -v",
         "cs-check": "phpcs",
         "cs-fix": "phpcbf",
-        "test": "phpunit",
-        "test-coverage": "phpunit --coverage-clover clover.xml"
+        "test": "phpunit --colors=always",
+        "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
     }
 }