diff options
Diffstat (limited to 'composer.json')
| -rw-r--r-- | composer.json | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/composer.json b/composer.json index 707b842..fb51101 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ }, "prefer-stable": true, "require": { - "php": "^7.0", + "php": "^7.1", "ext-dom": "*", "ext-json": "*", "ext-libxml": "*", @@ -31,13 +31,13 @@ "phar-io/manifest": "^1.0.1", "phar-io/version": "^1.0", "phpspec/prophecy": "^1.7", - "phpunit/php-code-coverage": "^5.3", + "phpunit/php-code-coverage": "^6.0", "phpunit/php-file-iterator": "^1.4.3", "phpunit/php-text-template": "^1.2.1", - "phpunit/php-timer": "^1.0.9", - "phpunit/phpunit-mock-objects": "^5.0.5", + "phpunit/php-timer": "^2.0", + "phpunit/phpunit-mock-objects": "^6.0", "sebastian/comparator": "^2.1", - "sebastian/diff": "^2.0", + "sebastian/diff": "^3.0", "sebastian/environment": "^3.1", "sebastian/exporter": "^3.1", "sebastian/global-state": "^2.0", @@ -48,19 +48,15 @@ "require-dev": { "ext-PDO": "*" }, - "conflict": { - "phpunit/dbunit": "<3.0", - "phpdocumentor/reflection-docblock": "3.0.2" - }, "config": { "platform": { - "php": "7.0.0" + "php": "7.1.0" }, "optimize-autoloader": true, "sort-packages": true }, "suggest": { - "phpunit/php-invoker": "^1.1", + "phpunit/php-invoker": "^2.0", "ext-xdebug": "*" }, "bin": [ @@ -77,12 +73,14 @@ ], "files": [ "src/Framework/Assert/Functions.php", - "tests/_files/CoveredFunction.php" + "tests/_files/CoverageNamespacedFunctionTest.php", + "tests/_files/CoveredFunction.php", + "tests/_files/NamespaceCoveredFunction.php" ] }, "extra": { "branch-alias": { - "dev-master": "6.5.x-dev" + "dev-master": "7.0-dev" } } } |