diff --git a/.gitignore b/.gitignore index 8cddd1b..e11ba56 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /.phpcs.cache /composer.lock /infection-log.txt +/.phpunit.result.cache diff --git a/.travis.yml b/.travis.yml index 4449ba8..35e2eb0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,11 @@ -dist: trusty +dist: xenial sudo: false language: php php: - 7.2 + - 7.3 + - 7.4snapshot - nightly cache: @@ -21,9 +23,8 @@ script: jobs: allow_failures: + - php: 7.4snapshot - php: nightly - - env: STATIC_ANALYSIS=1 - - env: MUTATION_TESTS=1 include: - stage: Code Quality diff --git a/composer.json b/composer.json index f68aa4b..39025cf 100644 --- a/composer.json +++ b/composer.json @@ -14,22 +14,21 @@ "sort-packages": true }, "require": { - "php": "^7.2", - "chimera/foundation": "^0.1", + "php": "^7.2 || ^8.0", + "chimera/foundation": "^0.2@dev", "lcobucci/content-negotiation-middleware": "^1.0", "middlewares/negotiation": "^1.0", "psr/http-server-middleware": "^1.0" }, "require-dev": { - "doctrine/coding-standard": "^4.0", - "infection/infection": "dev-master@dev", - "phpstan/phpdoc-parser": "^0.3@dev", - "phpstan/phpstan": "^0.10@dev", - "phpstan/phpstan-phpunit": "^0.10@dev", - "phpstan/phpstan-strict-rules": "^0.10@dev", - "phpunit/phpunit": "^7.1", - "squizlabs/php_codesniffer": "^3.2", - "zendframework/zend-diactoros": "^1.7" + "infection/infection": "^0.12", + "lcobucci/coding-standard": "^2.0", + "phpstan/phpstan": "^0.11", + "phpstan/phpstan-deprecation-rules": "^0.11", + "phpstan/phpstan-phpunit": "^0.11", + "phpstan/phpstan-strict-rules": "^0.11", + "phpunit/phpunit": "^8.0", + "zendframework/zend-diactoros": "^2.0" }, "autoload": { "psr-4": { diff --git a/phpcs.xml.dist b/phpcs.xml.dist index f499bcc..66df720 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -13,23 +13,5 @@ src tests - - - - - - - - - - - - - - - - - - - + diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 136c6b3..11ee2d3 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -2,6 +2,7 @@ includes: - vendor/phpstan/phpstan-phpunit/extension.neon - vendor/phpstan/phpstan-phpunit/rules.neon - vendor/phpstan/phpstan-strict-rules/rules.neon + - vendor/phpstan/phpstan-deprecation-rules/rules.neon parameters: level: 7 diff --git a/src/RouteParamsExtraction.php b/src/RouteParamsExtraction.php index 5076931..a0a2973 100644 --- a/src/RouteParamsExtraction.php +++ b/src/RouteParamsExtraction.php @@ -26,7 +26,7 @@ public function __construct(RouteParamsExtractor $extractor) public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface { return $handler->handle( - $request->withAttribute(__CLASS__, $this->extractor->getParams($request)) + $request->withAttribute(self::class, $this->extractor->getParams($request)) ); } }