Merge pull request #124 from cultuurnet/III-6082/upgrade-phpstan

III-6082 Upgrade phpstan
cultuurnet · Mar 7, 2024 · ff260ca · ff260ca
2 parents 56a13cf + 8115f5b
commit ff260ca
Show file tree

Hide file tree

Showing 10 changed files with 1,676 additions and 718 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,7 +1,7 @@
 # CODEOWNERS are automatically assigned as possible reviewers to new PRs.
 
 # Global owners (also need to be duplicated in later rules)
-* @LucWollants @JonasVHG @simon-debruijn
+* @LucWollants @JonasVHG @simon-debruijn @grubolsch
 
 # Jenkins / deployment owners
 Gemfile* @willaerk @paulherbosch

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -98,4 +98,4 @@ jobs:
           run: composer install --no-progress --no-suggest
 
         - name: 🔍 Run static analysis
-          run: composer phpstan
+          run: composer phpstan
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,4 @@
 config.yml
 /log
 /.php_cs.cache
+.phpunit.result.cache
diff --git a/app/Error/ApiExceptionHandler.php b/app/Error/ApiExceptionHandler.php
@@ -6,10 +6,10 @@
 
 use CultuurNet\UDB3\JwtProvider\Domain\Exception\JwtProviderExceptionInterface;
 use Fig\Http\Message\StatusCodeInterface;
+use Laminas\HttpHandlerRunner\Emitter\EmitterInterface;
 use Psr\Http\Message\ResponseInterface;
 use Slim\Psr7\Response;
 use Whoops\Handler\Handler;
-use Zend\HttpHandlerRunner\Emitter\EmitterInterface;
 
 final class ApiExceptionHandler extends Handler
 {

diff --git a/app/Factory/ErrorHandlerFactory.php b/app/Factory/ErrorHandlerFactory.php
@@ -6,11 +6,11 @@
 
 use CultuurNet\UDB3\JwtProvider\Error\ErrorLoggerHandler;
 use CultuurNet\UDB3\JwtProvider\Error\ApiExceptionHandler;
+use Laminas\HttpHandlerRunner\Emitter\SapiStreamEmitter;
 use Psr\Log\LoggerInterface;
 use Whoops\Handler\PrettyPageHandler;
 use Whoops\Run;
 use Whoops\RunInterface;
-use Zend\HttpHandlerRunner\Emitter\SapiStreamEmitter;
 
 final class ErrorHandlerFactory
 {

diff --git a/composer.json b/composer.json
@@ -20,18 +20,18 @@
         "monolog/monolog": "^1.11",
         "slim/psr7": "^0.6",
         "symfony/yaml": "^4.3",
-        "zendframework/zend-httphandlerrunner": "^1.1",
         "auth0/auth0-php": "^5.7",
         "beberlei/assert": "^3.2",
         "cultuurnet/culturefeed-php": "^1.10",
         "cultuurnet/udb3-api-guard": "^v4.0.0",
-        "sentry/sdk": "^2.2.0"
+        "sentry/sdk": "^2.2.0",
+        "php-http/message-factory": "^1.1",
+        "laminas/laminas-httphandlerrunner": "^2.2"
     },
     "require-dev": {
         "phpunit/phpunit": "^7.5",
         "publiq/php-cs-fixer-config": "^1.3",
-        "phpstan/phpstan": "^0.12.80",
-        "jangregor/phpstan-prophecy": "^0.8.1"
+        "jangregor/phpstan-prophecy": "^1.0"
     },
     "autoload": {
         "psr-4": {
@@ -54,6 +54,9 @@
         "preferred-install": {
             "cultuurnet/*": "source",
             "*": "dist"
+        },
+        "allow-plugins": {
+            "php-http/discovery": true
         }
     },
     "scripts": {