Skip to content

Commit

Permalink
Merge pull request #36 from jolicode/up
Browse files Browse the repository at this point in the history
Fixed compat with php 7.4 + bumped deps
  • Loading branch information
joelwurtz authored Feb 27, 2020
2 parents 7e629ed + 602462a commit 36830f3
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 12 deletions.
6 changes: 2 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,13 @@ cache:
- $HOME/.composer/cache/files

php:
- 7.0
- 7.1
- 7.2
- 7.3
- 7.4

matrix:
fast_finish: true
include:
- php: 7.0
- php: 7.2
env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest"

before_install:
Expand Down
12 changes: 6 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,19 @@
"test": "bin/asynit tests/"
},
"require": {
"php": "^7.0",
"php": "^7.2",
"amphp/artax": "^3.0.14",
"amphp/sync": "^1.0",
"bovigo/assert": "^2.1||^3.0",
"bovigo/assert": "^5.0 || ^6.0",
"doctrine/annotations": "^1.2",
"doctrine/collections": "^1.3",
"guzzlehttp/psr7": "^1.4",
"php-http/client-common": "^1.4",
"php-http/message": "^1.3",
"symfony/console": "^3.2||^4.0",
"symfony/dom-crawler": "^3.1||^4.0",
"symfony/finder": "^3.1||^4.0",
"symfony/yaml": "^3.3||^4.0"
"symfony/console": "^4.4",
"symfony/dom-crawler": "^4.4",
"symfony/finder": "^4.4",
"symfony/yaml": "^4.4"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.10"
Expand Down
4 changes: 2 additions & 2 deletions src/Parser/TestPoolBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ private function processTestAnnotations(\ArrayObject $tests, Test $test)

$dependentTest = false;

if (array_key_exists($dependency, $tests)) {
$dependentTest = $tests[$dependency];
if ($tests->offsetExists($dependency)) {
$dependentTest = $tests->offsetGet($dependency);
} elseif (is_callable($dependency)) {
if (false === strpos($dependency, '::')) {
$dependentTest = new Test(new \ReflectionMethod($test->getMethod()->getDeclaringClass()->getName(), $annotation->getDependency()), null, false);
Expand Down

0 comments on commit 36830f3

Please sign in to comment.