Merging develop to master in preparation for 1.4.0 release.

Author: weierophinney

.coveralls.yml

@@ -0,0 +1,2 @@
+coverage_clover: clover.xml
+json_path: coveralls-upload.json

.gitattributes

@@ -1,6 +1,9 @@
-/test export-ignore
-.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,2 +1,4 @@
-vendor/
-phpunit.xml
+/clover.xml
+/coveralls-upload.json
+/phpunit.xml
+/vendor/

.travis.yml

@@ -5,21 +5,21 @@ language: php
 cache:
   directories:
     - $HOME/.composer/cache
-    - vendor
 
 env:
   global:
-    - COMPOSER_ARGS="--no-interaction --ignore-platform-reqs"
+    - COMPOSER_ARGS="--no-interaction"
+    - COVERAGE_DEPS="php-coveralls/php-coveralls"
 
 matrix:
-  fast_finish: true
   include:
     - php: 5.6
       env:
         - DEPS=lowest
     - php: 5.6
       env:
         - DEPS=locked
+        - LEGACY_DEPS="phpunit/phpunit"
     - php: 5.6
       env:
         - DEPS=latest
@@ -29,36 +29,48 @@ matrix:
     - php: 7
       env:
         - DEPS=locked
-        - CS_CHECK=true
+        - LEGACY_DEPS="phpunit/phpunit"
     - php: 7
       env:
         - DEPS=latest
-    - php: hhvm 
+    - php: 7.1
       env:
         - DEPS=lowest
-    - php: hhvm 
+    - php: 7.1
       env:
         - DEPS=locked
-    - php: hhvm 
+        - CS_CHECK=true
+        - TEST_COVERAGE=true
+    - php: 7.1
+      env:
+        - DEPS=latest
+    - php: 7.2
+      env:
+        - DEPS=lowest
+    - php: 7.2
+      env:
+        - DEPS=locked
+    - php: 7.2
       env:
         - DEPS=latest
-  allow_failures:
-    - php: hhvm
-  
-notifications:
-  irc: "irc.freenode.org#apigility-dev"
-  email: false
 
 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 [[ $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
-  - travis_retry composer install $COMPOSER_ARGS
-  - composer show
+  - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
+  - stty cols 120 && composer show
 
 script:
-  - composer test
+  - 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 -v ; fi
+
+notifications:
+  email: false

CHANGELOG.md

@@ -2,10 +2,14 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 1.3.1 - TBD
+## 1.4.0 - 2018-05-03
 
 ### Added
 
+- [#200](https://github.com/zfcampus/zf-apigility/pull/200) adds support for PHP 7.1 and 7.2.
+
+### Changed
+
 - Nothing.
 
 ### Deprecated
@@ -14,11 +18,12 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Removed
 
-- Nothing.
+- [#200](https://github.com/zfcampus/zf-apigility/pull/200) removes support for HHVM.
 
 ### Fixed
 
-- Nothing.
+- [#194](https://github.com/zfcampus/zf-apigility/pull/194) fixes an issue within `Zend\Apigility\Application` whereby it was not
+  clearing the "stop propagation" flag prior to triggering new events.
 
 ## 1.3.0 - 2016-07-28
 

CONTRIBUTING.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

LICENSE.md

@@ -1,10 +1,9 @@
-ZF Apigility
-============
+# ZF Apigility
 
-[![Build Status](https://travis-ci.org/zfcampus/zf-apigility.png)](https://travis-ci.org/zfcampus/zf-apigility)
+[![Build Status](https://secure.travis-ci.org/zfcampus/zf-apigility.svg?branch=master)](https://secure.travis-ci.org/zfcampus/zf-apigility)
+[![Coverage Status](https://coveralls.io/repos/github/zfcampus/zf-apigility/badge.svg?branch=master)](https://coveralls.io/github/zfcampus/zf-apigility?branch=master)
 
-Introduction
-------------
+## Introduction
 
 Meta-module for Zend Framework combining features from:
 
@@ -21,13 +20,11 @@ in order to provide a cohesive solution for exposing web-based APIs.
 
 Also features database-connected REST resources.
 
-Requirements
-------------
+## Requirements
 
 Please see the [composer.json](composer.json) file.
 
-Installation
-------------
+## Installation
 
 Run the following `composer` command:
 
@@ -65,8 +62,7 @@ return [
 > that plugin will install zf-apigility, and all modules it depends on, as a
 > module in your application configuration for you.
 
-Assets
-------
+## Assets
 
 If you are using this module along with the [admin](https://github.com/zfcampus/zf-apigility-admin)
 and/or the [welcome screen](https://github.com/zfcampus/zf-apigility-welcome),
@@ -85,8 +81,7 @@ you have two options:
   plugin *first*, and then this module. (If you have already installed this
   module, remove it using `composer remove zfcampus/zf-apigility`.)
 
-Configuration
-=============
+## Configuration
 
 ### User Configuration
 
@@ -170,8 +165,7 @@ return [
 ];
 ```
 
-ZF Events
-=========
+## ZF Events
 
 ### Listeners
 
@@ -196,8 +190,7 @@ conditionally attach `ZF\ApiProblem\RenderErrorListener` when an `MvcEvent`'s re
 `HalJsonModel` or `JsonModel`, ensuring `zf-api-problem` can render a response in situations where
 a rendering error occurs.
 
-ZF Services
-===========
+## ZF Services
 
 ### Factories
 

README.md

@@ -1,29 +1,20 @@
 {
     "name": "zfcampus/zf-apigility",
     "description": "Apigility module for Zend Framework",
-    "type": "library",
     "license": "BSD-3-Clause",
     "keywords": [
+        "zf",
+        "zendframework",
         "api",
         "apigility",
-        "framework",
-        "zf2"
+        "framework"
     ],
-    "homepage": "http://apigility.org/",
     "support": {
-        "email": "[email protected]",
-        "irc": "irc://irc.freenode.net/apigility",
+        "issues": "https://github.com/zfcampus/zf-apigility/issues",
         "source": "https://github.com/zfcampus/zf-apigility",
-        "issues": "https://github.com/zfcampus/zf-apigility/issues"
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.3-dev",
-            "dev-develop": "1.4-dev"
-        },
-        "zf": {
-            "module": "ZF\\Apigility"
-        }
+        "rss": "https://github.com/zfcampus/zf-apigility/releases.atom",
+        "chat": "https://zendframework-slack.herokuapp.com",
+        "forum": "https://discourse.zendframework.com/c/questions/apigility"
     },
     "require": {
         "php": "^5.6 || ^7.0",
@@ -46,8 +37,8 @@
         "zfcampus/zf-versioning": "^1.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8 || ^5.0",
-        "squizlabs/php_codesniffer": "^2.6.2",
+        "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.5",
+        "zendframework/zend-coding-standard": "~1.0.0",
         "zendframework/zend-http": "^2.5.4"
     },
     "suggest": {
@@ -65,13 +56,26 @@
             "ZFTest\\Apigility\\": "test/"
         }
     },
+    "config": {
+        "sort-packages": true
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.4.x-dev",
+            "dev-develop": "1.5.x-dev"
+        },
+        "zf": {
+            "module": "ZF\\Apigility"
+        }
+    },
     "scripts": {
         "check": [
             "@cs-check",
             "@test"
         ],
         "cs-check": "phpcs",
         "cs-fix": "phpcbf",
-        "test": "phpunit"
+        "test": "phpunit --colors=always",
+        "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
     }
 }