Merge branch 'develop'

Author: michalbundyra

.travis.yml

@@ -7,12 +7,16 @@ cache:
 services:
   - memcached
   - mongodb
-  - rabbitmq
   - redis-server
 
+addons:
+  apt:
+    packages:
+      - rabbitmq-server
+
 env:
   global:
-    - COMPOSER_ARGS="--no-interaction"
+    - COMPOSER_ARGS="--no-interaction --no-plugins"
     - COVERAGE_DEPS="php-coveralls/php-coveralls"
     - TESTS_ZEND_DIAGNOSTICS_APCU_ENABLED=true
     - TESTS_ZEND_DIAGNOSTICS_MONGO_ENABLED=true
@@ -32,7 +36,7 @@ matrix:
       env:
         - DEPS=locked
         - MONGO_LEGACY=true
-        - LEGACY_DEPS="phpunit/phpunit"
+        - LEGACY_DEPS="doctrine/migrations phpunit/phpunit sensiolabs/security-checker symfony/yaml"
         - TESTS_ZEND_DIAGNOSTICS_APCU_ENABLED=false
         - TESTS_ZEND_DIAGNOSTICS_MEMCACHE_ENABLED=true
         - TESTS_ZEND_DIAGNOSTICS_MEMCACHED_ENABLED=false
@@ -47,11 +51,6 @@ matrix:
       env:
         - DEPS=lowest
         - TESTS_ZEND_DIAGNOSTICS_MEMCACHED_ENABLED=true
-    - php: 7
-      env:
-        - DEPS=locked
-        - LEGACY_DEPS="phpunit/phpunit"
-        - TESTS_ZEND_DIAGNOSTICS_MEMCACHED_ENABLED=true
     - php: 7
       env:
         - DEPS=latest
@@ -62,22 +61,14 @@ matrix:
         - TESTS_ZEND_DIAGNOSTICS_MEMCACHED_ENABLED=true
     - php: 7.1
       env:
-        - DEPS=locked
-        - TESTS_ZEND_DIAGNOSTICS_MEMCACHED_ENABLED=true
+        - DEPS=latest
         - CS_CHECK=true
         - TEST_COVERAGE=true
-    - php: 7.1
-      env:
-        - DEPS=latest
         - TESTS_ZEND_DIAGNOSTICS_MEMCACHED_ENABLED=true
     - php: 7.2
       env:
         - DEPS=lowest
         - TESTS_ZEND_DIAGNOSTICS_MEMCACHED_ENABLED=true
-    - php: 7.2
-      env:
-        - DEPS=locked
-        - TESTS_ZEND_DIAGNOSTICS_MEMCACHED_ENABLED=true
     - php: 7.2
       env:
         - DEPS=latest
@@ -98,7 +89,7 @@ matrix:
 before_install:
   - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
   - if [[ $TESTS_ZEND_DIAGNOSTICS_APCU_ENABLED == 'true' ]]; then echo "extension = apcu.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini ; fi
-  - if [[ $TESTS_ZEND_DIAGNOSTICS_MEMCACHE_ENABLED == 'true' ]]; then echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini ; fi
+  - if [[ $TESTS_ZEND_DIAGNOSTICS_MEMCACHE_ENABLED == 'true' ]]; then yes|CFLAGS="-fgnu89-inline" pecl install -f memcache ; fi
   - if [[ $TESTS_ZEND_DIAGNOSTICS_MEMCACHED_ENABLED == 'true' ]]; then echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini ; fi
   - if [[ $MONGO_LEGACY == 'true' ]]; then echo "extension = mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini ; fi
   - if [[ $MONGO_LEGACY != 'true' ]]; then pecl upgrade mongodb ; fi

CHANGELOG.md

@@ -4,6 +4,30 @@ All notable changes to this project will be documented in this file, in reverse
 
 Releases prior to 1.2.0 did not have entries.
 
+## 1.6.0 - TBD
+
+### Added
+
+- [#101](https://github.com/zendframework/zend-diagnostics/pull/101) adds compatibility with symfony/yaml `^5.0`.
+
+- [#101](https://github.com/zendframework/zend-diagnostics/pull/101) adds compatibility with sensiolabs/security-checker `^6.0`.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
 ## 1.5.1 - TBD
 
 ### Added

composer.json

@@ -27,8 +27,8 @@
         "php-amqplib/php-amqplib": "^2.0",
         "phpunit/phpunit": "^5.7.27 || 6.5.8 || ^7.1.2",
         "predis/predis": "^1.0",
-        "sensiolabs/security-checker": "^5.0",
-        "symfony/yaml": "^2.7 || ^3.0 || ^4.0",
+        "sensiolabs/security-checker": "^5.0 || ^6.0.3",
+        "symfony/yaml": "^2.7 || ^3.0 || ^4.0 || ^5.0",
         "zendframework/zend-coding-standard": "~1.0.0",
         "zendframework/zend-loader": "^2.0"
     },