diff --git a/.travis.yml b/.travis.yml index c9e508b..5567a82 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,4 @@ language: php - dist: trusty matrix: @@ -9,6 +8,7 @@ matrix: - php: 7.4 env: ANALYSIS='true' - php: nightly + allow_failures: - php: nightly diff --git a/composer.json b/composer.json index 77f82a1..92a8bb6 100644 --- a/composer.json +++ b/composer.json @@ -18,16 +18,17 @@ } ], "require": { - "php": "^7.2", + "php": "^7.2 || ^8.0", "psr/http-message": "^1.0", "slim/slim": "^4.7", "twig/twig": "^3.1" }, "require-dev": { - "phpunit/phpunit": "^8.5", + "phpunit/phpunit": "^8.5.13 || ^9.3.8", + "phpstan/phpstan": "^0.12.58", "psr/http-factory": "^1.0", "squizlabs/php_codesniffer": "^3.5", - "phpstan/phpstan": "^0.12.58" + "weirdan/prophecy-shim": "^1.0 || ^2.0.2" }, "autoload": { "psr-4": { diff --git a/phpunit.xml.dist b/phpunit.xml.dist index f54f0a8..33f8298 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,6 +1,6 @@ ./tests/ - - + + + ./src/ - - - - - + + + + + diff --git a/tests/TestCase.php b/tests/TestCase.php index 4bb1df2..9407dd7 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -9,11 +9,14 @@ namespace Slim\Tests; +use Prophecy\PhpUnit\ProphecyTrait; use PHPUnit\Framework\TestCase as PhpUnitTestCase; use ReflectionProperty; abstract class TestCase extends PhpUnitTestCase { + use ProphecyTrait; + protected function assertInaccessiblePropertySame($expected, $obj, string $name) { $prop = new ReflectionProperty(get_class($obj), $name);