diff --git a/.travis.yml b/.travis.yml index 734d470a..8f7c7102 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,11 +8,11 @@ services: cache: directories: - $HOME/.composer/cache - - vendor env: global: - - COMPOSER_ARGS="--no-interaction --ignore-platform-reqs" + - COMPOSER_ARGS="--no-interaction" + - LEGACY_DEPS="phpunit/phpunit" matrix: fast_finish: true @@ -53,24 +53,23 @@ matrix: - 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 + - if [[ $TEST_COVERAGE != 'true' && "$(php --version | grep xdebug -ci)" -ge 1 ]]; then phpenv config-rm xdebug.ini || return 0 ; fi - if [[ $EXT_MONGODB == 'true' && $TRAVIS_PHP_VERSION == '7' ]]; then echo "extension = mongodb.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini ; fi - if [[ $EXT_MONGODB == 'true' && $TRAVIS_PHP_VERSION == 'hhvm' ]]; then echo "extension = mongodb.so" >> /etc/hhvm/php.ini ; fi - if [[ $EXT_MONGODB != 'true' && $TRAVIS_PHP_VERSION != 'hhvm' ]]; then echo "extension = mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini ; fi - if [[ $EXT_MONGODB != 'true' && $TRAVIS_PHP_VERSION == 'hhvm' ]]; then echo "extension = mongo.so" >> /etc/hhvm/php.ini ; fi - - travis_retry composer self-update install: - - if [[ $EXT_MONGODB == 'true' ]]; then composer require --dev $COMPOSER_ARGS alcaeus/mongo-php-adapter ; fi + - 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 [[ $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 + - if [[ $EXT_MONGODB == 'true' ]]; then composer require --dev $COMPOSER_ARGS alcaeus/mongo-php-adapter ; fi - if [[ $TRAVIS_PHP_VERSION != 'hhvm' ]]; then php -m ; fi - - composer show + - stty cols 120 && composer show script: - composer test diff --git a/CHANGELOG.md b/CHANGELOG.md index b653b839..9f77182d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ All notable changes to this project will be documented in this file, in reverse - Nothing. +### Changed + +- Nothing. + ### Deprecated - Nothing. @@ -20,6 +24,31 @@ All notable changes to this project will be documented in this file, in reverse - Nothing. +## 1.5.11 - 2017-11-14 + +### Added + +- Nothing. + +### Changed + +- Nothing. + +### Deprecated + +- Nothing. + +### Removed + +- Nothing. + +### Fixed + +- [#378](https://github.com/zfcampus/zf-apigility-admin/pull/378) modifies the + package requirements to exclude zf-configuration v1.3.1, as that version has a + backwards-incompatible change that prevents creation of services via the + admin. + ## 1.5.10 - 2017-08-14 ### Added diff --git a/composer.json b/composer.json index eff1b04d..4fd39b49 100644 --- a/composer.json +++ b/composer.json @@ -43,7 +43,7 @@ "zfcampus/zf-apigility-admin-ui": "^1.3.7", "zfcampus/zf-apigility-provider": "^1.2", "zfcampus/zf-api-problem": "^1.2.1", - "zfcampus/zf-configuration": "^1.2.1", + "zfcampus/zf-configuration": "1.2.1 - 1.3.0 || >1.3.1 <2.0", "zfcampus/zf-content-negotiation": "^1.2.2", "zfcampus/zf-content-validation": "^1.3.4", "zfcampus/zf-hal": "^1.4.2", diff --git a/composer.lock b/composer.lock index 97a66368..57f6822a 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "edfba329688559ae4b693c44f339dd53", - "content-hash": "d5d864bde2eea1925a20710f08e3b466", + "content-hash": "87bbe1578ed4504fe9ae3184577137fb", "packages": [ { "name": "bshaffer/oauth2-server-php", @@ -54,7 +53,7 @@ "oauth", "oauth2" ], - "time": "2015-09-18 18:05:10" + "time": "2015-09-18T18:05:10+00:00" }, { "name": "container-interop/container-interop", @@ -81,7 +80,7 @@ "MIT" ], "description": "Promoting the interoperability of container objects (DIC, SL, etc.)", - "time": "2014-12-30 15:22:37" + "time": "2014-12-30T15:22:37+00:00" }, { "name": "paragonie/random_compat", @@ -129,7 +128,7 @@ "pseudorandom", "random" ], - "time": "2016-04-03 06:00:07" + "time": "2016-04-03T06:00:07+00:00" }, { "name": "zendframework/zend-authentication", @@ -191,7 +190,7 @@ "Authentication", "zf2" ], - "time": "2016-02-28 15:02:34" + "time": "2016-02-28T15:02:34+00:00" }, { "name": "zendframework/zend-code", @@ -244,7 +243,7 @@ "code", "zf2" ], - "time": "2016-06-30 22:35:27" + "time": "2016-06-30T22:35:27+00:00" }, { "name": "zendframework/zend-config", @@ -300,7 +299,7 @@ "config", "zf2" ], - "time": "2016-02-04 23:01:10" + "time": "2016-02-04T23:01:10+00:00" }, { "name": "zendframework/zend-crypt", @@ -351,7 +350,7 @@ "crypt", "zf2" ], - "time": "2016-06-21 18:15:32" + "time": "2016-06-21T18:15:32+00:00" }, { "name": "zendframework/zend-db", @@ -408,7 +407,7 @@ "db", "zf2" ], - "time": "2016-08-09 19:28:55" + "time": "2016-08-09T19:28:55+00:00" }, { "name": "zendframework/zend-escaper", @@ -452,7 +451,7 @@ "escaper", "zf2" ], - "time": "2016-06-30 19:48:38" + "time": "2016-06-30T19:48:38+00:00" }, { "name": "zendframework/zend-eventmanager", @@ -506,7 +505,7 @@ "events", "zf2" ], - "time": "2016-02-18 20:53:00" + "time": "2016-02-18T20:53:00+00:00" }, { "name": "zendframework/zend-filter", @@ -566,7 +565,7 @@ "filter", "zf2" ], - "time": "2016-04-18 18:32:43" + "time": "2016-04-18T18:32:43+00:00" }, { "name": "zendframework/zend-http", @@ -616,7 +615,7 @@ "http", "zf2" ], - "time": "2016-08-08 15:01:54" + "time": "2016-08-08T15:01:54+00:00" }, { "name": "zendframework/zend-hydrator", @@ -678,7 +677,7 @@ "hydrator", "zf2" ], - "time": "2016-04-18 17:59:29" + "time": "2016-04-18T17:59:29+00:00" }, { "name": "zendframework/zend-inputfilter", @@ -733,7 +732,7 @@ "inputfilter", "zf2" ], - "time": "2016-06-11 19:35:33" + "time": "2016-06-11T19:35:33+00:00" }, { "name": "zendframework/zend-json", @@ -783,7 +782,7 @@ "json", "zf2" ], - "time": "2016-04-01 02:34:00" + "time": "2016-04-01T02:34:00+00:00" }, { "name": "zendframework/zend-loader", @@ -827,7 +826,7 @@ "loader", "zf2" ], - "time": "2015-06-03 14:05:47" + "time": "2015-06-03T14:05:47+00:00" }, { "name": "zendframework/zend-math", @@ -877,7 +876,7 @@ "math", "zf2" ], - "time": "2016-04-28 17:37:42" + "time": "2016-04-28T17:37:42+00:00" }, { "name": "zendframework/zend-modulemanager", @@ -936,7 +935,7 @@ "modulemanager", "zf2" ], - "time": "2016-05-16 21:21:11" + "time": "2016-05-16T21:21:11+00:00" }, { "name": "zendframework/zend-mvc", @@ -1001,7 +1000,7 @@ "mvc", "zf2" ], - "time": "2016-06-30 20:30:28" + "time": "2016-06-30T20:30:28+00:00" }, { "name": "zendframework/zend-paginator", @@ -1065,7 +1064,7 @@ "paginator", "zf2" ], - "time": "2016-04-11 21:18:13" + "time": "2016-04-11T21:18:13+00:00" }, { "name": "zendframework/zend-permissions-acl", @@ -1114,7 +1113,7 @@ "acl", "zf2" ], - "time": "2016-02-03 21:46:45" + "time": "2016-02-03T21:46:45+00:00" }, { "name": "zendframework/zend-permissions-rbac", @@ -1159,7 +1158,7 @@ "rbac", "zf2" ], - "time": "2015-06-03 14:05:54" + "time": "2015-06-03T14:05:54+00:00" }, { "name": "zendframework/zend-router", @@ -1220,7 +1219,7 @@ "routing", "zf2" ], - "time": "2016-05-31 20:47:48" + "time": "2016-05-31T20:47:48+00:00" }, { "name": "zendframework/zend-servicemanager", @@ -1275,7 +1274,7 @@ "servicemanager", "zf" ], - "time": "2016-07-15 14:59:51" + "time": "2016-07-15T14:59:51+00:00" }, { "name": "zendframework/zend-stdlib", @@ -1320,7 +1319,7 @@ "stdlib", "zf2" ], - "time": "2016-04-12 21:19:36" + "time": "2016-04-12T21:19:36+00:00" }, { "name": "zendframework/zend-uri", @@ -1367,7 +1366,7 @@ "uri", "zf2" ], - "time": "2016-02-17 22:38:51" + "time": "2016-02-17T22:38:51+00:00" }, { "name": "zendframework/zend-validator", @@ -1438,7 +1437,7 @@ "validator", "zf2" ], - "time": "2016-06-23 13:44:31" + "time": "2016-06-23T13:44:31+00:00" }, { "name": "zendframework/zend-view", @@ -1525,7 +1524,7 @@ "view", "zf2" ], - "time": "2016-06-30 22:28:07" + "time": "2016-06-30T22:28:07+00:00" }, { "name": "zfcampus/zf-api-problem", @@ -1582,7 +1581,7 @@ "zend", "zf2" ], - "time": "2016-07-07 13:52:00" + "time": "2016-07-07T13:52:00+00:00" }, { "name": "zfcampus/zf-apigility", @@ -1655,7 +1654,7 @@ "framework", "zf2" ], - "time": "2016-07-28 13:47:39" + "time": "2016-07-28T13:47:39+00:00" }, { "name": "zfcampus/zf-apigility-admin-ui", @@ -1706,7 +1705,7 @@ "framework", "zf2" ], - "time": "2016-08-14 16:37:00" + "time": "2016-08-14T16:37:00+00:00" }, { "name": "zfcampus/zf-apigility-provider", @@ -1752,38 +1751,38 @@ "framework", "zf2" ], - "time": "2016-07-13 18:03:54" + "time": "2016-07-13T18:03:54+00:00" }, { "name": "zfcampus/zf-configuration", - "version": "1.2.1", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/zfcampus/zf-configuration.git", - "reference": "51231865e277454595fd9dc9dadb9944a8c96bff" + "reference": "9213c09125bbf27e6c9bc78df73d2598a3f3c97d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zfcampus/zf-configuration/zipball/51231865e277454595fd9dc9dadb9944a8c96bff", - "reference": "51231865e277454595fd9dc9dadb9944a8c96bff", + "url": "https://api.github.com/repos/zfcampus/zf-configuration/zipball/9213c09125bbf27e6c9bc78df73d2598a3f3c97d", + "reference": "9213c09125bbf27e6c9bc78df73d2598a3f3c97d", "shasum": "" }, "require": { "php": "^5.6 || ^7.0", - "zendframework/zend-config": "^2.6", + "zendframework/zend-config": "^2.6 || ^3.0", "zendframework/zend-modulemanager": "^2.7.1", "zendframework/zend-stdlib": "^2.7.7 || ^3.0.1" }, "require-dev": { "container-interop/container-interop": "^1.1", - "phpunit/phpunit": "^4.8 || ^5.5", - "squizlabs/php_codesniffer": "^2.6.2" + "phpunit/phpunit": "^5.7.15 || ^6.0.8", + "zendframework/zend-coding-standard": "~1.0.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2-dev", - "dev-develop": "1.3-dev" + "dev-master": "1.3-dev", + "dev-develop": "1.4-dev" }, "zf": { "module": "ZF\\Configuration" @@ -1807,7 +1806,7 @@ "zend", "zf2" ], - "time": "2016-08-13 15:17:08" + "time": "2017-08-24T14:12:38+00:00" }, { "name": "zfcampus/zf-content-negotiation", @@ -1871,7 +1870,7 @@ "zend", "zf2" ], - "time": "2016-07-27 20:13:12" + "time": "2016-07-27T20:13:12+00:00" }, { "name": "zfcampus/zf-content-validation", @@ -1932,7 +1931,7 @@ "zend", "zf2" ], - "time": "2016-08-04 22:27:17" + "time": "2016-08-04T22:27:17+00:00" }, { "name": "zfcampus/zf-hal", @@ -1993,7 +1992,7 @@ "zend", "zf2" ], - "time": "2016-07-28 14:13:49" + "time": "2016-07-28T14:13:49+00:00" }, { "name": "zfcampus/zf-mvc-auth", @@ -2053,7 +2052,7 @@ "zend", "zf2" ], - "time": "2016-08-03 20:34:18" + "time": "2016-08-03T20:34:18+00:00" }, { "name": "zfcampus/zf-oauth2", @@ -2120,7 +2119,7 @@ "oauth2", "zf2" ], - "time": "2016-07-10 23:11:53" + "time": "2016-07-10T23:11:53+00:00" }, { "name": "zfcampus/zf-rest", @@ -2186,7 +2185,7 @@ "zf2", "zf3" ], - "time": "2016-07-12 21:08:39" + "time": "2016-07-12T21:08:39+00:00" }, { "name": "zfcampus/zf-rpc", @@ -2244,7 +2243,7 @@ "zend", "zf2" ], - "time": "2016-07-12 22:18:34" + "time": "2016-07-12T22:18:34+00:00" }, { "name": "zfcampus/zf-versioning", @@ -2300,7 +2299,7 @@ "zend", "zf2" ], - "time": "2016-07-13 20:03:22" + "time": "2016-07-13T20:03:22+00:00" } ], "packages-dev": [ @@ -2356,7 +2355,7 @@ "constructor", "instantiate" ], - "time": "2015-06-14 21:17:01" + "time": "2015-06-14T21:17:01+00:00" }, { "name": "herrera-io/json", @@ -2416,7 +2415,7 @@ "schema", "validate" ], - "time": "2013-10-30 16:51:34" + "time": "2013-10-30T16:51:34+00:00" }, { "name": "herrera-io/phar-update", @@ -2473,7 +2472,7 @@ "phar", "update" ], - "time": "2013-10-30 17:23:01" + "time": "2013-10-30T17:23:01+00:00" }, { "name": "justinrainbow/json-schema", @@ -2539,7 +2538,7 @@ "json", "schema" ], - "time": "2016-01-25 15:43:01" + "time": "2016-01-25T15:43:01+00:00" }, { "name": "kherge/version", @@ -2581,7 +2580,7 @@ ], "description": "A parsing and comparison library for semantic versioning.", "homepage": "http://github.com/kherge/Version", - "time": "2012-08-16 17:13:03" + "time": "2012-08-16T17:13:03+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -2635,7 +2634,7 @@ "reflection", "static analysis" ], - "time": "2015-12-27 11:43:31" + "time": "2015-12-27T11:43:31+00:00" }, { "name": "phpdocumentor/reflection-docblock", @@ -2680,7 +2679,7 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2016-06-10 09:48:41" + "time": "2016-06-10T09:48:41+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -2727,7 +2726,7 @@ "email": "me@mikevanriel.com" } ], - "time": "2016-06-10 07:14:17" + "time": "2016-06-10T07:14:17+00:00" }, { "name": "phpspec/prophecy", @@ -2789,7 +2788,7 @@ "spy", "stub" ], - "time": "2016-06-07 08:13:47" + "time": "2016-06-07T08:13:47+00:00" }, { "name": "phpunit/php-code-coverage", @@ -2851,7 +2850,7 @@ "testing", "xunit" ], - "time": "2015-10-06 15:47:00" + "time": "2015-10-06T15:47:00+00:00" }, { "name": "phpunit/php-file-iterator", @@ -2898,7 +2897,7 @@ "filesystem", "iterator" ], - "time": "2015-06-21 13:08:43" + "time": "2015-06-21T13:08:43+00:00" }, { "name": "phpunit/php-text-template", @@ -2939,7 +2938,7 @@ "keywords": [ "template" ], - "time": "2015-06-21 13:50:34" + "time": "2015-06-21T13:50:34+00:00" }, { "name": "phpunit/php-timer", @@ -2983,7 +2982,7 @@ "keywords": [ "timer" ], - "time": "2016-05-12 18:03:57" + "time": "2016-05-12T18:03:57+00:00" }, { "name": "phpunit/php-token-stream", @@ -3032,7 +3031,7 @@ "keywords": [ "tokenizer" ], - "time": "2015-09-15 10:49:45" + "time": "2015-09-15T10:49:45+00:00" }, { "name": "phpunit/phpunit", @@ -3104,7 +3103,7 @@ "testing", "xunit" ], - "time": "2016-07-21 06:48:14" + "time": "2016-07-21T06:48:14+00:00" }, { "name": "phpunit/phpunit-mock-objects", @@ -3160,7 +3159,7 @@ "mock", "xunit" ], - "time": "2015-10-02 06:51:40" + "time": "2015-10-02T06:51:40+00:00" }, { "name": "sebastian/comparator", @@ -3224,7 +3223,7 @@ "compare", "equality" ], - "time": "2015-07-26 15:48:44" + "time": "2015-07-26T15:48:44+00:00" }, { "name": "sebastian/diff", @@ -3276,7 +3275,7 @@ "keywords": [ "diff" ], - "time": "2015-12-08 07:14:41" + "time": "2015-12-08T07:14:41+00:00" }, { "name": "sebastian/environment", @@ -3326,7 +3325,7 @@ "environment", "hhvm" ], - "time": "2016-05-17 03:18:57" + "time": "2016-05-17T03:18:57+00:00" }, { "name": "sebastian/exporter", @@ -3393,7 +3392,7 @@ "export", "exporter" ], - "time": "2016-06-17 09:04:28" + "time": "2016-06-17T09:04:28+00:00" }, { "name": "sebastian/global-state", @@ -3444,7 +3443,7 @@ "keywords": [ "global state" ], - "time": "2015-10-12 03:26:01" + "time": "2015-10-12T03:26:01+00:00" }, { "name": "sebastian/recursion-context", @@ -3497,7 +3496,7 @@ ], "description": "Provides functionality to recursively process PHP variables", "homepage": "http://www.github.com/sebastianbergmann/recursion-context", - "time": "2015-11-11 19:50:13" + "time": "2015-11-11T19:50:13+00:00" }, { "name": "sebastian/version", @@ -3532,7 +3531,7 @@ ], "description": "Library that helps with managing the version number of Git-hosted PHP projects", "homepage": "https://github.com/sebastianbergmann/version", - "time": "2015-06-21 13:59:46" + "time": "2015-06-21T13:59:46+00:00" }, { "name": "seld/jsonlint", @@ -3578,7 +3577,7 @@ "parser", "validator" ], - "time": "2015-11-21 02:21:41" + "time": "2015-11-21T02:21:41+00:00" }, { "name": "squizlabs/php_codesniffer", @@ -3656,7 +3655,7 @@ "phpcs", "standards" ], - "time": "2016-07-13 23:29:13" + "time": "2016-07-13T23:29:13+00:00" }, { "name": "symfony/yaml", @@ -3705,7 +3704,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2016-07-17 14:02:08" + "time": "2016-07-17T14:02:08+00:00" }, { "name": "webmozart/assert", @@ -3755,7 +3754,7 @@ "check", "validate" ], - "time": "2016-08-09 15:02:57" + "time": "2016-08-09T15:02:57+00:00" }, { "name": "zendframework/zend-console", @@ -3807,7 +3806,7 @@ "console", "zf2" ], - "time": "2016-02-09 17:15:12" + "time": "2016-02-09T17:15:12+00:00" }, { "name": "zfcampus/zf-console", @@ -3861,7 +3860,7 @@ "zend", "zf2" ], - "time": "2016-07-11 20:33:55" + "time": "2016-07-11T20:33:55+00:00" }, { "name": "zfcampus/zf-deploy", @@ -3913,7 +3912,7 @@ "zend", "zf2" ], - "time": "2016-07-12 17:31:21" + "time": "2016-07-12T17:31:21+00:00" } ], "aliases": [],