Merge pull request #14 from middlewares/issue/13

oscarotero · web-flow · commit 722e463350da · 2025-03-15T18:38:01.000+01:00
Issue #13 + dev improvements
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -1,10 +1,10 @@
 name: "testing"
 
 on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
+    push:
+        branches: [ master ]
+    pull_request:
+        branches: [ master ]
 
 jobs:
     qa:
@@ -13,19 +13,19 @@ jobs:
 
         steps:
             - name: Checkout
-              uses: actions/checkout@v2
+              uses: actions/checkout@v4
 
             - name: Validate composer.json and composer.lock
               run: composer validate
 
             - name: Cache Composer packages
               id: composer-cache
-              uses: actions/cache@v2
+              uses: actions/cache@v4
               with:
-                path: vendor
-                key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
-                restore-keys: |
-                  ${{ runner.os }}-php-
+                  path: vendor
+                  key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
+                  restore-keys: |
+                      ${{ runner.os }}-php-
 
             - name: Install dependencies
               if: steps.composer-cache.outputs.cache-hit != 'true'
@@ -40,25 +40,27 @@ jobs:
 
         strategy:
             matrix:
-              php:
-                - 7.2
-                - 7.3
-                - 7.4
-                - 8.0
-                - 8.1
-                - 8.2
+                php:
+                    - 7.2
+                    - 7.3
+                    - 7.4
+                    - 8.0
+                    - 8.1
+                    - 8.2
+                    - 8.3
+                    - 8.4
 
         steps:
             - name: Checkout
-              uses: actions/checkout@v2
+              uses: actions/checkout@v4
 
             - name: Install PHP
               uses: shivammathur/setup-php@v2
               with:
                   php-version: ${{ matrix.php }}
 
             - name: Cache PHP dependencies
-              uses: actions/cache@v2
+              uses: actions/cache@v4
               with:
                   path: vendor
                   key: ${{ runner.os }}-php-${{ matrix.php }}-composer-${{ hashFiles('**/composer.json') }}
@@ -69,6 +71,3 @@ jobs:
 
             - name: Tests
               run: composer test
-
-            - name: Tests coverage
-              run: composer coverage
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,6 @@
+.idea
 vendor
 composer.lock
 coverage
 *.cache
+kit
diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.0.3] - 2024-03-21
+### Added / Fixed
+- Support for PHP 8.3 and PHP 8.4 (removed deprecation notices)
+
 ## [2.0.3] - 2024-03-21
 ### Fixed
 - Allow middlewares/utils 4.0
@@ -86,6 +90,7 @@ First version
 [#7]: https://github.com/middlewares/whoops/issues/7
 [#11]: https://github.com/middlewares/whoops/issues/11
 
+[2.0.3]: https://github.com/middlewares/whoops/compare/v2.0.3...v2.0.4
 [2.0.3]: https://github.com/middlewares/whoops/compare/v2.0.2...v2.0.3
 [2.0.2]: https://github.com/middlewares/whoops/compare/v2.0.1...v2.0.2
 [2.0.1]: https://github.com/middlewares/whoops/compare/v2.0.0...v2.0.1
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2019
+Copyright (c) 2019-2025
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/composer.json b/composer.json
@@ -18,19 +18,18 @@
     },
     "require": {
         "php": "^7.2 || ^8.0",
-        "filp/whoops": "^2.5",
+        "filp/whoops": "^2.17",
         "middlewares/utils": "^3.0 || ^4.0",
         "psr/http-server-middleware": "^1.0",
         "psr/container": "^1.0 || ^2.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^8|^9",
-        "laminas/laminas-diactoros": "^2.2",
-        "friendsofphp/php-cs-fixer": "^2.0",
-        "squizlabs/php_codesniffer": "^3.0",
-        "oscarotero/php-cs-fixer-config": "^1.0",
-        "eloquent/phony-phpunit": "^5.0 || ^7.0",
-        "phpstan/phpstan": "^0.12"
+        "phpunit/phpunit": "^8 || ^9",
+        "laminas/laminas-diactoros": "^2 || ^3",
+        "friendsofphp/php-cs-fixer": "^3",
+        "squizlabs/php_codesniffer": "^3.11",
+        "oscarotero/php-cs-fixer-config": "^1 || ^2",
+        "phpstan/phpstan": "^1 || ^2"
     },
     "autoload": {
         "psr-4": {
@@ -44,7 +43,7 @@
     },
     "scripts": {
         "cs": "phpcs",
-        "cs-fix": "php-cs-fixer fix",
+        "cs-fix": "PHP_CS_FIXER_IGNORE_ENV=1 php-cs-fixer fix",
         "phpstan": "phpstan analyse",
         "test": "phpunit",
         "coverage": "phpunit --coverage-text",
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -0,0 +1,5 @@
+parameters:
+	level: 6
+	paths:
+		- src
+		- tests
diff --git a/src/Whoops.php b/src/Whoops.php
@@ -42,8 +42,8 @@ class Whoops implements MiddlewareInterface
      * Set the whoops instance.
      */
     public function __construct(
-        Run $whoops = null,
-        ResponseFactoryInterface $responseFactory = null
+        ?Run $whoops = null,
+        ?ResponseFactoryInterface $responseFactory = null
     ) {
         $this->whoops = $whoops;
         $this->responseFactory = $responseFactory ?: Factory::getResponseFactory();
diff --git a/tests/HandlerTest.php b/tests/HandlerTest.php
@@ -3,7 +3,6 @@
 
 namespace Middlewares\Tests;
 
-use Eloquent\Phony\Phpunit\Phony;
 use Middlewares\Utils\Dispatcher;
 use Middlewares\Utils\Factory;
 use Middlewares\Whoops;
@@ -12,15 +11,17 @@
 
 class HandlerTest extends TestCase
 {
-    private static function getContainer()
+    private static function getContainer(): WhoopsHandlerContainer
     {
-        $container = Phony::partialMock(WhoopsHandlerContainer::class)->get();
-        Phony::onStatic($container)->isCli->returns(false);
-
-        return $container;
+        return new class() extends WhoopsHandlerContainer {
+            protected static function isCli(): bool
+            {
+                return false;
+            }
+        };
     }
 
-    public function testJson()
+    public function testJson(): void
     {
         $request = Factory::createServerRequest('GET', '/')->withHeader('Accept', 'application/json');
 
@@ -35,7 +36,7 @@ function () {
         $this->assertEquals('application/json', $response->getHeaderLine('Content-Type'));
     }
 
-    public function testXml()
+    public function testXml(): void
     {
         $request = Factory::createServerRequest('GET', '/')->withHeader('Accept', 'text/xml');
 
@@ -50,7 +51,7 @@ function () {
         $this->assertEquals('text/xml', $response->getHeaderLine('Content-Type'));
     }
 
-    public function testPlain()
+    public function testPlain(): void
     {
         $request = Factory::createServerRequest('GET', '/')->withHeader('Accept', 'text/plain');
 
@@ -65,7 +66,7 @@ function () {
         $this->assertEquals('text/plain', $response->getHeaderLine('Content-Type'));
     }
 
-    public function testHtml()
+    public function testHtml(): void
     {
         $request = Factory::createServerRequest('GET', '/')->withHeader('Accept', 'text/html');
 
@@ -80,7 +81,7 @@ function () {
         $this->assertEquals('text/html', $response->getHeaderLine('Content-Type'));
     }
 
-    public function testDefault()
+    public function testDefault(): void
     {
         $request = Factory::createServerRequest('GET', '/')->withHeader('Accept', 'foo/bar');
 
@@ -95,7 +96,7 @@ function () {
         $this->assertEquals('text/html', $response->getHeaderLine('Content-Type'));
     }
 
-    public function testEmptyAccept()
+    public function testEmptyAccept(): void
     {
         $response = Dispatcher::run([
             (new Whoops())->handlerContainer(self::getContainer()),
diff --git a/tests/WhoopsTest.php b/tests/WhoopsTest.php
@@ -9,7 +9,7 @@
 
 class WhoopsTest extends TestCase
 {
-    public function testError()
+    public function testError(): void
     {
         $response = Dispatcher::run([
             new Whoops(),
@@ -23,13 +23,14 @@ function () {
         $this->assertNotFalse(strpos((string) $response->getBody(), 'Error Processing Request'));
     }
 
-    public function testStandardError()
+    public function testStandardError(): void
     {
         error_reporting(E_ALL);
 
         $response = Dispatcher::run([
             new Whoops(),
             function () {
+                /** @phpstan-ignore variable.undefined */
                 $a = $b; //undefined variable
             },
         ]);
@@ -39,7 +40,7 @@ function () {
         $this->assertNotFalse(strpos((string) $response->getBody(), 'Undefined variable'));
     }
 
-    public function testNotError()
+    public function testNotError(): void
     {
         $response = Dispatcher::run([
             new Whoops(),

-Original file line number
+Diff line change
@@ @@ -1,4 +1,6 @@ @@
 +.idea
 vendor
 composer.lock
 coverage
 *.cache
 +kit
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`
`4`	`4`	`namespace Middlewares\Tests;`
`5`	`5`
`6`		`-use Eloquent\Phony\Phpunit\Phony;`
`7`	`6`	`use Middlewares\Utils\Dispatcher;`
`8`	`7`	`use Middlewares\Utils\Factory;`
`9`	`8`	`use Middlewares\Whoops;`
`@@ -12,15 +11,17 @@`
`12`	`11`
`13`	`12`	`class HandlerTest extends TestCase`
`14`	`13`	`{`
`15`		`- private static function getContainer()`
	`14`	`+ private static function getContainer(): WhoopsHandlerContainer`
`16`	`15`	`{`
`17`		`- $container = Phony::partialMock(WhoopsHandlerContainer::class)->get();`
`18`		`- Phony::onStatic($container)->isCli->returns(false);`
`19`		`-`
`20`		`- return $container;`
	`16`	`+ return new class() extends WhoopsHandlerContainer {`
	`17`	`+ protected static function isCli(): bool`
	`18`	`+ {`
	`19`	`+ return false;`
	`20`	`+ }`
	`21`	`+ };`
`21`	`22`	`}`
`22`	`23`
`23`		`- public function testJson()`
	`24`	`+ public function testJson(): void`
`24`	`25`	`{`
`25`	`26`	`$request = Factory::createServerRequest('GET', '/')->withHeader('Accept', 'application/json');`
`26`	`27`
`@@ -35,7 +36,7 @@ function () {`
`35`	`36`	`$this->assertEquals('application/json', $response->getHeaderLine('Content-Type'));`
`36`	`37`	`}`
`37`	`38`
`38`		`- public function testXml()`
	`39`	`+ public function testXml(): void`
`39`	`40`	`{`
`40`	`41`	`$request = Factory::createServerRequest('GET', '/')->withHeader('Accept', 'text/xml');`
`41`	`42`
`@@ -50,7 +51,7 @@ function () {`
`50`	`51`	`$this->assertEquals('text/xml', $response->getHeaderLine('Content-Type'));`
`51`	`52`	`}`
`52`	`53`
`53`		`- public function testPlain()`
	`54`	`+ public function testPlain(): void`
`54`	`55`	`{`
`55`	`56`	`$request = Factory::createServerRequest('GET', '/')->withHeader('Accept', 'text/plain');`
`56`	`57`
`@@ -65,7 +66,7 @@ function () {`
`65`	`66`	`$this->assertEquals('text/plain', $response->getHeaderLine('Content-Type'));`
`66`	`67`	`}`
`67`	`68`
`68`		`- public function testHtml()`
	`69`	`+ public function testHtml(): void`
`69`	`70`	`{`
`70`	`71`	`$request = Factory::createServerRequest('GET', '/')->withHeader('Accept', 'text/html');`
`71`	`72`
`@@ -80,7 +81,7 @@ function () {`
`80`	`81`	`$this->assertEquals('text/html', $response->getHeaderLine('Content-Type'));`
`81`	`82`	`}`
`82`	`83`
`83`		`- public function testDefault()`
	`84`	`+ public function testDefault(): void`
`84`	`85`	`{`
`85`	`86`	`$request = Factory::createServerRequest('GET', '/')->withHeader('Accept', 'foo/bar');`
`86`	`87`
`@@ -95,7 +96,7 @@ function () {`
`95`	`96`	`$this->assertEquals('text/html', $response->getHeaderLine('Content-Type'));`
`96`	`97`	`}`
`97`	`98`
`98`		`- public function testEmptyAccept()`
	`99`	`+ public function testEmptyAccept(): void`
`99`	`100`	`{`
`100`	`101`	`$response = Dispatcher::run([`
`101`	`102`	`(new Whoops())->handlerContainer(self::getContainer()),`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`
`10`	`10`	`class WhoopsTest extends TestCase`
`11`	`11`	`{`
`12`		`- public function testError()`
	`12`	`+ public function testError(): void`
`13`	`13`	`{`
`14`	`14`	`$response = Dispatcher::run([`
`15`	`15`	`new Whoops(),`
`@@ -23,13 +23,14 @@ function () {`
`23`	`23`	`$this->assertNotFalse(strpos((string) $response->getBody(), 'Error Processing Request'));`
`24`	`24`	`}`
`25`	`25`
`26`		`- public function testStandardError()`
	`26`	`+ public function testStandardError(): void`
`27`	`27`	`{`
`28`	`28`	`error_reporting(E_ALL);`
`29`	`29`
`30`	`30`	`$response = Dispatcher::run([`
`31`	`31`	`new Whoops(),`
`32`	`32`	`function () {`
	`33`	`+ /** @phpstan-ignore variable.undefined */`
`33`	`34`	`$a = $b; //undefined variable`
`34`	`35`	`},`
`35`	`36`	`]);`
`@@ -39,7 +40,7 @@ function () {`
`39`	`40`	`$this->assertNotFalse(strpos((string) $response->getBody(), 'Undefined variable'));`
`40`	`41`	`}`
`41`	`42`
`42`		`- public function testNotError()`
	`43`	`+ public function testNotError(): void`
`43`	`44`	`{`
`44`	`45`	`$response = Dispatcher::run([`
`45`	`46`	`new Whoops(),`