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

Commit d27aa06

Browse files
authored
Merge pull request #83 from zendframework/php7_2_fix
fix PHP 7.2 issue and update the build matrix
2 parents 74e09d5 + 45d54d5 commit d27aa06

File tree

3 files changed

+17
-19
lines changed

3 files changed

+17
-19
lines changed

.travis.yml

+5-7
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,21 @@ cache:
1111
- $HOME/.composer/cache
1212

1313
php:
14-
- 5.3
15-
- 5.3.3
16-
- 5.4
17-
- 5.5
1814
- 5.6
15+
- 7.0
16+
- 7.1
17+
- 7.2
1918

2019
before_install:
2120
- composer self-update
2221
- phpenv config-rm xdebug.ini
23-
- if [[ "$TRAVIS_PHP_VERSION" != "5.3" && "$TRAVIS_PHP_VERSION" != "5.3.3" ]]; then composer require --no-update guzzlehttp/guzzle:~4; fi
24-
- if [ "$TRAVIS_PHP_VERSION" = "5.6" ]; then composer require --no-update fabpot/php-cs-fixer:1.9.*; fi
22+
- composer require --no-update fabpot/php-cs-fixer:1.9.*
2523

2624
install: composer update $COMPOSER_FLAGS --prefer-dist
2725

2826
script:
2927
- ./vendor/bin/phpunit -c ./tests/ --coverage-text
30-
- if [ "$TRAVIS_PHP_VERSION" = "5.6" ]; then ./vendor/bin/php-cs-fixer fix -v --dry-run --level=psr2 .; fi
28+
- ./vendor/bin/php-cs-fixer fix -v --dry-run --level=psr2 .
3129

3230
notifications:
3331
irc: "irc.freenode.org#zftalk.dev"

composer.json

+11-11
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,19 @@
1515
}
1616
},
1717
"require": {
18-
"php": ">=5.3.3"
18+
"php": "^5.6|^7.0"
1919
},
2020
"require-dev": {
21-
"zendframework/zend-loader" : "2.*",
22-
"sensiolabs/security-checker": "1.3.*@dev",
23-
"symfony/yaml" : "v2.3.11",
24-
"guzzle/http" : "3.*",
25-
"guzzle/plugin-mock" : "3.*",
26-
"videlalvaro/php-amqplib" : "2.*",
27-
"predis/predis" : "0.8.*",
28-
"phpunit/phpunit" : "4.7.*",
29-
"doctrine/migrations" : "~1.0@dev",
30-
"mikey179/vfsStream" : "1.6.*"
21+
"zendframework/zend-loader" : "^2.0",
22+
"sensiolabs/security-checker": "^1.3",
23+
"symfony/yaml" : "^2.7|^3.0|^4.0",
24+
"guzzle/http" : "^3.0",
25+
"guzzle/plugin-mock" : "^3.0",
26+
"php-amqplib/php-amqplib" : "^2.0",
27+
"predis/predis" : "^1.0",
28+
"phpunit/phpunit" : "^4.7|^5.0",
29+
"doctrine/migrations" : "^1.0",
30+
"mikey179/vfsStream" : "^1.6"
3131
},
3232
"suggest" : {
3333
"ext-bcmath" : "Required by Check\\CpuPerformance",

src/ZendDiagnostics/Result/Collection.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public function offsetExists($index)
127127
* @param mixed|null $checkResult
128128
* @link http://php.net/manual/en/splobjectstorage.offsetset.php
129129
*/
130-
public function offsetSet($index, $checkResult)
130+
public function offsetSet($index, $checkResult = null)
131131
{
132132
$this->validateIndex($index);
133133
$this->validateValue($checkResult);

0 commit comments

Comments
 (0)