Skip to content
This repository was archived by the owner on Jan 31, 2020. It is now read-only.

Commit 50acdb6

Browse files
committed
Merge branch 'develop'
2 parents d4d50fe + 75eea59 commit 50acdb6

File tree

4 files changed

+1877
-1352
lines changed

4 files changed

+1877
-1352
lines changed

.travis.yml

+9-18
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,16 @@ cache:
77
services:
88
- memcached
99
- mongodb
10-
- rabbitmq
1110
- redis-server
1211

12+
addons:
13+
apt:
14+
packages:
15+
- rabbitmq-server
16+
1317
env:
1418
global:
15-
- COMPOSER_ARGS="--no-interaction"
19+
- COMPOSER_ARGS="--no-interaction --no-plugins"
1620
- COVERAGE_DEPS="php-coveralls/php-coveralls"
1721
- TESTS_ZEND_DIAGNOSTICS_APCU_ENABLED=true
1822
- TESTS_ZEND_DIAGNOSTICS_MONGO_ENABLED=true
@@ -32,7 +36,7 @@ matrix:
3236
env:
3337
- DEPS=locked
3438
- MONGO_LEGACY=true
35-
- LEGACY_DEPS="phpunit/phpunit"
39+
- LEGACY_DEPS="doctrine/migrations phpunit/phpunit sensiolabs/security-checker symfony/yaml"
3640
- TESTS_ZEND_DIAGNOSTICS_APCU_ENABLED=false
3741
- TESTS_ZEND_DIAGNOSTICS_MEMCACHE_ENABLED=true
3842
- TESTS_ZEND_DIAGNOSTICS_MEMCACHED_ENABLED=false
@@ -47,11 +51,6 @@ matrix:
4751
env:
4852
- DEPS=lowest
4953
- TESTS_ZEND_DIAGNOSTICS_MEMCACHED_ENABLED=true
50-
- php: 7
51-
env:
52-
- DEPS=locked
53-
- LEGACY_DEPS="phpunit/phpunit"
54-
- TESTS_ZEND_DIAGNOSTICS_MEMCACHED_ENABLED=true
5554
- php: 7
5655
env:
5756
- DEPS=latest
@@ -62,22 +61,14 @@ matrix:
6261
- TESTS_ZEND_DIAGNOSTICS_MEMCACHED_ENABLED=true
6362
- php: 7.1
6463
env:
65-
- DEPS=locked
66-
- TESTS_ZEND_DIAGNOSTICS_MEMCACHED_ENABLED=true
64+
- DEPS=latest
6765
- CS_CHECK=true
6866
- TEST_COVERAGE=true
69-
- php: 7.1
70-
env:
71-
- DEPS=latest
7267
- TESTS_ZEND_DIAGNOSTICS_MEMCACHED_ENABLED=true
7368
- php: 7.2
7469
env:
7570
- DEPS=lowest
7671
- TESTS_ZEND_DIAGNOSTICS_MEMCACHED_ENABLED=true
77-
- php: 7.2
78-
env:
79-
- DEPS=locked
80-
- TESTS_ZEND_DIAGNOSTICS_MEMCACHED_ENABLED=true
8172
- php: 7.2
8273
env:
8374
- DEPS=latest
@@ -98,7 +89,7 @@ matrix:
9889
before_install:
9990
- if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
10091
- if [[ $TESTS_ZEND_DIAGNOSTICS_APCU_ENABLED == 'true' ]]; then echo "extension = apcu.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini ; fi
101-
- if [[ $TESTS_ZEND_DIAGNOSTICS_MEMCACHE_ENABLED == 'true' ]]; then echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini ; fi
92+
- if [[ $TESTS_ZEND_DIAGNOSTICS_MEMCACHE_ENABLED == 'true' ]]; then yes|CFLAGS="-fgnu89-inline" pecl install -f memcache ; fi
10293
- if [[ $TESTS_ZEND_DIAGNOSTICS_MEMCACHED_ENABLED == 'true' ]]; then echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini ; fi
10394
- if [[ $MONGO_LEGACY == 'true' ]]; then echo "extension = mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini ; fi
10495
- if [[ $MONGO_LEGACY != 'true' ]]; then pecl upgrade mongodb ; fi

CHANGELOG.md

+24
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,30 @@ All notable changes to this project will be documented in this file, in reverse
44

55
Releases prior to 1.2.0 did not have entries.
66

7+
## 1.6.0 - TBD
8+
9+
### Added
10+
11+
- [#101](https://github.com/zendframework/zend-diagnostics/pull/101) adds compatibility with symfony/yaml `^5.0`.
12+
13+
- [#101](https://github.com/zendframework/zend-diagnostics/pull/101) adds compatibility with sensiolabs/security-checker `^6.0`.
14+
15+
### Changed
16+
17+
- Nothing.
18+
19+
### Deprecated
20+
21+
- Nothing.
22+
23+
### Removed
24+
25+
- Nothing.
26+
27+
### Fixed
28+
29+
- Nothing.
30+
731
## 1.5.1 - TBD
832

933
### Added

composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
"php-amqplib/php-amqplib": "^2.0",
2828
"phpunit/phpunit": "^5.7.27 || 6.5.8 || ^7.1.2",
2929
"predis/predis": "^1.0",
30-
"sensiolabs/security-checker": "^5.0",
31-
"symfony/yaml": "^2.7 || ^3.0 || ^4.0",
30+
"sensiolabs/security-checker": "^5.0 || ^6.0.3",
31+
"symfony/yaml": "^2.7 || ^3.0 || ^4.0 || ^5.0",
3232
"zendframework/zend-coding-standard": "~1.0.0",
3333
"zendframework/zend-loader": "^2.0"
3434
},

0 commit comments

Comments
 (0)