Merging develop to master in preparation for 1.3.0

Author: weierophinney

.gitattributes

@@ -0,0 +1,6 @@
+/test export-ignore
+.gitattributes export-ignore
+.gitignore export-ignore
+.travis.yml export-ignore
+phpcs.xml export-ignore
+phpunit.xml.dist export-ignore

.gitignore

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

.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

@@ -2,6 +2,34 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 1.3.0 - TBD
+
+### Added
+
+- [#99](https://github.com/zfcampus/zf-rest/pull/99) adds support for v3
+  releases of Zend Framework components, while retaining compatibility for v2
+  releases.
+- [#96](https://github.com/zfcampus/zf-rest/pull/96) adds a `Content-Location`
+  header to responses returned from `RestController::create()`, per
+  [RFC 7231](https://tools.ietf.org/html/rfc7231#section-3.1.4.2).
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- [#99](https://github.com/zfcampus/zf-rest/pull/99) removes support for PHP 5.5.
+
+### Fixed
+
+- [#70](https://github.com/zfcampus/zf-rest/pull/70) updates how the
+  `RestController` retrieves the identifier from `ZF\Hal\Entity` instances to
+  use the new `getId()` method introduced in zf-hal 1.4.
+- [#94](https://github.com/zfcampus/zf-rest/pull/94) updates the
+  `RestController` to return Problem Details with a status of 400 if the
+  page size requested by the client is below zero.
+
 ## 1.2.1 - 2016-07-12
 
 ### Added

Module.php

@@ -1,10 +1,11 @@
 {
     "name": "zfcampus/zf-rest",
-    "description": "ZF2 Module providing structure for RESTful resources",
+    "description": "ZF Module providing structure for RESTful resources",
     "type": "library",
     "license": "BSD-3-Clause",
     "keywords": [
         "zf2",
+        "zf3",
         "zend",
         "module",
         "rest"
@@ -16,51 +17,51 @@
         "source": "https://github.com/zfcampus/zf-rest",
         "issues": "https://github.com/zfcampus/zf-rest/issues"
     },
-    "repositories": [
-        { "type": "composer", "url": "https://packages.zendframework.com" }
-    ],
     "extra": {
         "branch-alias": {
             "dev-master": "1.2-dev",
             "dev-develop": "1.3-dev"
         }
     },
     "require": {
-        "php": ">=5.5",
-        "zendframework/zend-eventmanager": "^2.4.0",
-        "zendframework/zend-json": "^2.4.0",
-        "zendframework/zend-loader": "^2.4.0",
-        "zendframework/zend-mvc": "^2.4.0",
-        "zendframework/zend-paginator": "^2.4.0",
-        "zendframework/zend-stdlib": "^2.4.0",
-        "zfcampus/zf-api-problem": "~1.0",
-        "zfcampus/zf-content-negotiation": "~1.0",
-        "zfcampus/zf-hal": "~1.1",
-        "zfcampus/zf-mvc-auth": "~1.1"
+        "php": "^5.6 || ^7.0",
+        "zendframework/zend-eventmanager": "^2.6.3 || ^3.0.1",
+        "zendframework/zend-mvc": "^2.7.9 || ^3.0.2",
+        "zendframework/zend-paginator": "^2.7",
+        "zendframework/zend-stdlib": "^2.7.7 || ^3.0.1",
+        "zfcampus/zf-api-problem": "^1.2.1",
+        "zfcampus/zf-content-negotiation": "^1.2.1",
+        "zfcampus/zf-hal": "^1.4",
+        "zfcampus/zf-mvc-auth": "^1.4"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.7",
+        "phpunit/phpunit": "^4.8 || ^5.0",
         "squizlabs/php_codesniffer": "^2.3.1",
-        "zendframework/zend-console": "^2.4.0",
-        "zendframework/zend-escaper": "^2.4.0",
-        "zendframework/zend-http": "^2.4.0",
-        "zendframework/zend-inputfilter": "^2.4.0",
-        "zendframework/zend-servicemanager": "^2.4.0",
-        "zendframework/zend-uri": "^2.4.0",
-        "zendframework/zend-validator": "^2.4.0",
-        "zendframework/zend-view": "^2.4.0"
+        "zendframework/zend-escaper": "^2.5.2",
+        "zendframework/zend-http": "^2.5.4",
+        "zendframework/zend-inputfilter": "^2.7.2",
+        "zendframework/zend-servicemanager": "^2.7.6 || ^3.1",
+        "zendframework/zend-uri": "^2.5.2",
+        "zendframework/zend-validator": "^2.8.1",
+        "zendframework/zend-view": "^2.8.1"
     },
     "autoload": {
         "psr-4": {
             "ZF\\Rest\\": "src/"
-        },
-        "classmap": [
-            "Module.php"
-        ]
+        }
     },
     "autoload-dev": {
         "psr-4": {
             "ZFTest\\Rest\\": "test/"
         }
+    },
+    "scripts": {
+        "check": [
+            "@cs-check",
+            "@test"
+        ],
+        "cs-check": "phpcs",
+        "cs-fix": "phpcbf",
+        "test": "phpunit"
     }
 }