Merging develop to master for 1.2.0 release

Author: weierophinney

.gitignore

@@ -1,2 +1 @@
-composer.lock
 vendor/

.travis.yml

@@ -5,33 +5,60 @@ language: php
 cache:
   directories:
     - $HOME/.composer/cache
+    - vendor
+
+env:
+  global:
+    - COMPOSER_ARGS="--no-interaction --ignore-platform-reqs"
 
 matrix:
   fast_finish: true
   include:
-    - php: 5.5
+    - php: 5.6
+      env:
+        - DEPS=lowest
+    - php: 5.6
       env:
-        - EXECUTE_CS_CHECK=true
+        - DEPS=locked
     - php: 5.6
       env:
-        - EXECUTE_COVERAGE=true
+        - DEPS=latest
+    - php: 7
+      env:
+        - DEPS=lowest
+    - php: 7
+      env:
+        - DEPS=locked
+        - CS_CHECK=true
     - php: 7
+      env:
+        - DEPS=latest
+    - php: hhvm 
+      env:
+        - DEPS=lowest
     - php: hhvm 
+      env:
+        - DEPS=locked
+    - php: hhvm 
+      env:
+        - DEPS=latest
   allow_failures:
-    - php: 7
     - php: hhvm
 
 notifications:
   irc: "irc.freenode.org#apigility-dev"
   email: false
 
 before_install:
-  - if [[ $EXECUTE_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
-  - composer self-update
+  - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
+  - travis_retry composer self-update
 
 install:
-  - travis_retry composer install --no-interaction --ignore-platform-reqs --prefer-source
+  - 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
 
 script:
-  - ./vendor/bin/phpunit
-  - if [[ $EXECUTE_CS_CHECK == 'true' ]]; then ./vendor/bin/phpcs ; fi
+  - composer test
+  - if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi

CHANGELOG.md

@@ -0,0 +1,37 @@
+# Changelog
+
+All notable changes to this project will be documented in this file, in reverse chronological order by release.
+
+## 1.2.0 - TBD
+
+### Added
+
+- [#45](https://github.com/zfcampus/zf-api-problem/pull/45) adds support for PHP 7.
+- [#44](https://github.com/zfcampus/zf-api-problem/pull/44) and
+  [#45](https://github.com/zfcampus/zf-api-problem/pull/45) add support for
+  version 3 components of Zend Framework.
+- [#39](https://github.com/zfcampus/zf-api-problem/pull/39) adds the constant
+  `ApiProblem::CONTENT_TYPE` for specifying the Content-Type of API Problem
+  responses.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- [#45](https://github.com/zfcampus/zf-api-problem/pull/45) removes support for
+  PHP 5.6.
+- [#45](https://github.com/zfcampus/zf-api-problem/pull/45) removes the
+  `Module::getAutoloaderConfig()` implementation, as it was redundant in
+  composer-based applications.
+
+### Fixed
+
+- [#44](https://github.com/zfcampus/zf-api-problem/pull/44) and
+  [#45](https://github.com/zfcampus/zf-api-problem/pull/45) ensure that
+  definition and attachment of the listener aggregates defined in the module
+  will work with both v2 and v3 versions of zend-eventmanager.
+- [#38](https://github.com/zfcampus/zf-api-problem/pull/38) fixes an issue
+  whereby JSON encoding failed for included stack traces if they originated
+  within a PHP stream.

composer.json

@@ -17,40 +17,45 @@
         "source": "https://github.com/zfcampus/zf-api-problem",
         "issues": "https://github.com/zfcampus/zf-api-problem/issues"
     },
-    "repositories": [
-        { "type": "composer", "url": "https://packages.zendframework.com" }
-    ],
     "extra": {
         "branch-alias": {
             "dev-master": "1.1-dev",
             "dev-develop": "1.2-dev"
+        },
+        "zf": {
+            "module": "ZF\\ApiProblem"
         }
     },
     "require": {
-        "php": ">=5.5",
-        "zendframework/zend-eventmanager": "~2.3",
-        "zendframework/zend-http": "~2.3",
-        "zendframework/zend-json": "~2.3",
-        "zendframework/zend-mvc": "~2.3",
-        "zendframework/zend-view": "~2.3"
+        "php": "^5.6 || ^7.0",
+        "ext-json": "*",
+        "zendframework/zend-eventmanager": "^2.6.3 || ^3.0.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-view": "^2.8.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.7",
-        "zendframework/zend-console": "~2.3",
-        "zendframework/zend-loader": "~2.3",
+        "phpunit/phpunit": "^4.8",
         "squizlabs/php_codesniffer": "^2.3.1"
     },
     "autoload": {
         "psr-4": {
             "ZF\\ApiProblem\\": "src/"
-        },
-        "classmap": [
-            "Module.php"
-        ]
+        }
     },
     "autoload-dev": {
         "psr-4": {
             "ZFTest\\ApiProblem\\": "test/"
         }
+    },
+    "scripts": {
+        "check": [
+            "@cs-check",
+            "@test"
+        ],
+        "cs-check": "phpcs",
+        "cs-fix": "phpcbf",
+        "test": "phpunit"
     }
 }