Merge branch 'feature/304' into develop

Closes #304
zfcampus · Jan 18, 2018 · 025f728 · 025f728
2 parents a6fc33a + 21c77f5
commit 025f728
Show file tree

Hide file tree

Showing 11 changed files with 1,180 additions and 890 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,13 +8,12 @@ services:
 cache:
   directories:
     - $HOME/.composer/cache
-    - vendor
 
 env:
   global:
-    - COMPOSER_ARGS="--no-interaction --ignore-platform-reqs"
+    - COMPOSER_ARGS="--no-interaction"
     - ADAPTER_DEPS="alcaeus/mongo-php-adapter"
-    - COVERAGE_DEPS="satooshi/php-coveralls"
+    - COVERAGE_DEPS="php-coveralls/php-coveralls"
     - MONGO_DRIVER=mongo
 
 matrix:
@@ -25,7 +24,7 @@ matrix:
     - php: 5.6
       env:
         - DEPS=locked
-        - TEST_COVERAGE=true
+        - LEGACY_DEPS="doctrine/doctrine-module doctrine/doctrine-orm-module phpunit/phpunit zendframework/zend-code"
     - php: 5.6
       env:
         - DEPS=latest
@@ -36,7 +35,7 @@ matrix:
     - php: 7
       env:
         - DEPS=locked
-        - CS_CHECK=true
+        - LEGACY_DEPS="doctrine/doctrine-module doctrine/doctrine-orm-module phpunit/phpunit zendframework/zend-code"
         - MONGO_DRIVER=mongodb
     - php: 7
       env:
@@ -49,43 +48,46 @@ matrix:
     - php: 7.1
       env:
         - DEPS=locked
+        - CS_CHECK=true
+        - TEST_COVERAGE=true
         - MONGO_DRIVER=mongodb
     - php: 7.1
       env:
         - DEPS=latest
         - MONGO_DRIVER=mongodb
-    - php: hhvm
+    - php: 7.2
       env:
         - DEPS=lowest
-    - php: hhvm
+        - MONGO_DRIVER=mongodb
+    - php: 7.2
       env:
         - DEPS=locked
-    - php: hhvm
+        - MONGO_DRIVER=mongodb
+    - php: 7.2
       env:
         - DEPS=latest
-  allow_failures:
-    - php: hhvm
-
-notifications:
-  irc: "irc.freenode.org#apigility-dev"
-  email: false
+        - MONGO_DRIVER=mongodb
 
 before_install:
   - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
-  - travis_retry composer self-update
 
 install:
   - yes '' | pecl -q install -f $MONGO_DRIVER
-  - if [[ $MONGO_DRIVER == 'mongodb' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $ADAPTER_DEPS ; fi
-  - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
+  - composer config platform.ext-mongo '1.999'
+  - 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 [[ $MONGO_DRIVER == 'mongodb' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $ADAPTER_DEPS ; fi
+  - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
+  - stty cols 120 && composer show
 
 script:
   - 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 composer upload-coverage ; fi
+  - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry php vendor/bin/php-coveralls -v ; fi
+
+notifications:
+  email: false
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,13 +20,17 @@ All notable changes to this project will be documented in this file, in reverse
   ],
   ```
 
+- [#304](https://github.com/zfcampus/zf-apigility-doctrine/pull/304) adds
+  support for PHP 7.2.
+
 ### Deprecated
 
 - Nothing.
 
 ### Removed
 
-- Nothing.
+- [#304](https://github.com/zfcampus/zf-apigility-doctrine/pull/304) removes
+  support for HHVM.
 
 ### Fixed
 

diff --git a/composer.json b/composer.json
@@ -1,20 +1,24 @@
 {
     "name": "zfcampus/zf-apigility-doctrine",
     "description": "Apigility Doctrine module",
-    "type": "library",
     "license": "BSD-3-Clause",
     "keywords": [
         "api",
         "apigility",
-        "framework",
-        "zf",
-        "doctrine"
+        "doctrine",
+        "zendframework",
+        "zf"
     ],
     "homepage": "http://apigility.org/",
     "support": {
-        "irc": "irc://irc.freenode.net/apigility",
+        "issues": "https://github.com/zfcampus/zf-apigility-doctrine/issues",
         "source": "https://github.com/zfcampus/zf-apigility-doctrine",
-        "issues": "https://github.com/zfcampus/zf-apigility-doctrine/issues"
+        "rss": "https://github.com/zfcampus/zf-apigility-doctrine/releases.atom",
+        "slack": "https://zendframework-slack.herokuapp.com",
+        "forum": "https://discourse.zendframework.com/c/questions/apigility"
+    },
+    "config": {
+        "sort-packages": true
     },
     "extra": {
         "branch-alias": {
@@ -34,27 +38,27 @@
         "zfcampus/zf-apigility": "^1.3"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8",
-        "zendframework/zend-coding-standard": "~1.0.0",
         "doctrine/doctrine-module": "^1.2",
-        "doctrine/doctrine-mongo-odm-module": "^0.11",
+        "doctrine/doctrine-mongo-odm-module": "^1.0",
         "doctrine/doctrine-orm-module": "^1.1",
         "doctrine/mongodb-odm": "^1.0",
+        "phpunit/phpunit": "^5.7.26",
+        "zendframework/zend-coding-standard": "~1.0.0",
         "zendframework/zend-form": "^2.9.2",
         "zendframework/zend-i18n": "^2.7.3",
         "zendframework/zend-log": "^2.9.1",
-        "zendframework/zend-mvc": "^2.7.10 || ^3.0.2",
+        "zendframework/zend-mvc": "^2.7.13 || ^3.0.2",
         "zendframework/zend-serializer": "^2.8",
-        "zendframework/zend-test": "^2.6.1 || ^3.0.1",
         "zendframework/zend-stdlib": "^2.7.7 || ^3.0.1",
-        "zfcampus/zf-hal": "^1.4.2",
-        "zfcampus/zf-apigility-admin": "^1.5.7"
+        "zendframework/zend-test": "^2.6.1 || ^3.0.1",
+        "zfcampus/zf-apigility-admin": "^1.5.7",
+        "zfcampus/zf-hal": "^1.4.2"
     },
     "suggest": {
-        "doctrine/doctrine-orm-module": "For ORM mapping",
-        "doctrine/doctrine-mongo-odm-module": "For Mongo ODM mapping",
         "api-skeletons/zf-doctrine-hydrator": "Hydrator strategies for Doctrine in Apipgility",
-        "api-skeletons/zf-oauth2-doctrine": "OAuth2 Doctrine Adapter for Apigility"
+        "api-skeletons/zf-oauth2-doctrine": "OAuth2 Doctrine Adapter for Apigility",
+        "doctrine/doctrine-mongo-odm-module": "For Mongo ODM mapping",
+        "doctrine/doctrine-orm-module": "For ORM mapping"
     },
     "autoload": {
         "psr-4": {
@@ -71,10 +75,9 @@
             "@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"
     }
 }