Update requirement of psr/log and dev dependencies (#1)

batumibiz · web-flow · commit 3e2384470aa3 · 2022-12-18T15:18:34.000+03:00
* Added the ability to use the latest versions of psr/log

* Add ext-json dependency

* Updated PhpUnit configuration

* Fixed some tests

* Updated vimeo/psalm

* Updated squizlabs/php_codesniffer
diff --git a/composer.json b/composer.json
@@ -20,6 +20,7 @@
     },
     "require": {
         "php": "^7.4|^8.0",
+        "ext-json": "*",
         "httpsoft/http-cookie": "^1.0",
         "httpsoft/http-emitter": "^1.0",
         "httpsoft/http-error-handler": "^1.0",
@@ -33,14 +34,14 @@
         "psr/http-message": "^1.0",
         "psr/http-server-handler": "^1.0",
         "psr/http-server-middleware": "^1.0",
-        "psr/log": "^1.1"
+        "psr/log": "^1.1 || ^2.0 || ^3.0"
     },
     "require-dev": {
         "devanych/di-container": "^2.1",
         "devanych/view-renderer": "^1.0",
         "phpunit/phpunit": "^9.5",
-        "squizlabs/php_codesniffer": "^3.6",
-        "vimeo/psalm": "^4.9"
+        "squizlabs/php_codesniffer": "^3.7",
+        "vimeo/psalm": "^5.2"
     },
     "provide": {
         "psr/http-message-implementation": "1.0",
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,32 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<phpunit
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/8.5/phpunit.xsd"
-    bootstrap="./vendor/autoload.php"
-    executionOrder="depends,defects"
-    beStrictAboutCoversAnnotation="true"
-    beStrictAboutOutputDuringTests="true"
-    beStrictAboutTodoAnnotatedTests="true"
-    convertWarningsToExceptions="true"
-    convertNoticesToExceptions="true"
-    convertErrorsToExceptions="true"
-    stopOnFailure="false"
-    verbose="true"
-    colors="true"
->
-    <php>
-        <ini name="error_reporting" value="-1" />
-    </php>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         executionOrder="depends,defects"
+         beStrictAboutCoversAnnotation="true"
+         beStrictAboutOutputDuringTests="true"
+         beStrictAboutTodoAnnotatedTests="true"
+         failOnRisky="true"
+         failOnWarning="true"
+         verbose="true"
+         colors="true">
     <testsuites>
         <testsuite name="HttpSoft Basis Test Suite">
-            <directory>./tests/</directory>
+            <directory>tests</directory>
         </testsuite>
     </testsuites>
 
-    <filter>
-        <whitelist>
-            <directory suffix=".php">./src/</directory>
-        </whitelist>
-    </filter>
+    <coverage processUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">src</directory>
+        </include>
+    </coverage>
 </phpunit>
diff --git a/psalm.xml.dist b/psalm.xml.dist
@@ -1,11 +1,14 @@
 <?xml version="1.0"?>
 <psalm
-    errorLevel="1"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+    findUnusedPsalmSuppress="true"
 >
     <projectFiles>
-        <directory name="src" />
+        <directory name="src"/>
+        <ignoreFiles>
+            <directory name="vendor"/>
+        </ignoreFiles>
     </projectFiles>
 </psalm>
diff --git a/tests/ErrorHandler/LogErrorListenerTest.php b/tests/ErrorHandler/LogErrorListenerTest.php
@@ -41,41 +41,41 @@ private function createLogger(): LoggerInterface
             public string $message = '';
             public array $context = [];
 
-            public function error($message, array $context = [])
+            public function error($message, array $context = []): void
             {
                 $this->message = $message;
                 $this->context = $context;
             }
 
-            public function emergency($message, array $context = [])
+            public function emergency($message, array $context = []): void
             {
             }
 
-            public function alert($message, array $context = [])
+            public function alert($message, array $context = []): void
             {
             }
 
-            public function critical($message, array $context = [])
+            public function critical($message, array $context = []): void
             {
             }
 
-            public function warning($message, array $context = [])
+            public function warning($message, array $context = []): void
             {
             }
 
-            public function notice($message, array $context = [])
+            public function notice($message, array $context = []): void
             {
             }
 
-            public function info($message, array $context = [])
+            public function info($message, array $context = []): void
             {
             }
 
-            public function debug($message, array $context = [])
+            public function debug($message, array $context = []): void
             {
             }
 
-            public function log($level, $message, array $context = [])
+            public function log($level, $message, array $context = []): void
             {
             }
         };
diff --git a/tests/Response/PrepareJsonDataTraitTest.php b/tests/Response/PrepareJsonDataTraitTest.php
@@ -53,7 +53,7 @@ public function testPrepareJsonSerializable(): void
         $this->assertSame(
             ['a' => 1, 'b' => 'string'],
             $this->prepareJsonData(new class () implements JsonSerializable {
-                public function jsonSerialize()
+                public function jsonSerialize(): array
                 {
                     return ['a' => 1, 'b' => 'string'];
                 }

Original file line number	Diff line number	Diff line change
`@@ -41,41 +41,41 @@ private function createLogger(): LoggerInterface`
`41`	`41`	`public string $message = '';`
`42`	`42`	`public array $context = [];`
`43`	`43`
`44`		`- public function error($message, array $context = [])`
	`44`	`+ public function error($message, array $context = []): void`
`45`	`45`	`{`
`46`	`46`	`$this->message = $message;`
`47`	`47`	`$this->context = $context;`
`48`	`48`	`}`
`49`	`49`
`50`		`- public function emergency($message, array $context = [])`
	`50`	`+ public function emergency($message, array $context = []): void`
`51`	`51`	`{`
`52`	`52`	`}`
`53`	`53`
`54`		`- public function alert($message, array $context = [])`
	`54`	`+ public function alert($message, array $context = []): void`
`55`	`55`	`{`
`56`	`56`	`}`
`57`	`57`
`58`		`- public function critical($message, array $context = [])`
	`58`	`+ public function critical($message, array $context = []): void`
`59`	`59`	`{`
`60`	`60`	`}`
`61`	`61`
`62`		`- public function warning($message, array $context = [])`
	`62`	`+ public function warning($message, array $context = []): void`
`63`	`63`	`{`
`64`	`64`	`}`
`65`	`65`
`66`		`- public function notice($message, array $context = [])`
	`66`	`+ public function notice($message, array $context = []): void`
`67`	`67`	`{`
`68`	`68`	`}`
`69`	`69`
`70`		`- public function info($message, array $context = [])`
	`70`	`+ public function info($message, array $context = []): void`
`71`	`71`	`{`
`72`	`72`	`}`
`73`	`73`
`74`		`- public function debug($message, array $context = [])`
	`74`	`+ public function debug($message, array $context = []): void`
`75`	`75`	`{`
`76`	`76`	`}`
`77`	`77`
`78`		`- public function log($level, $message, array $context = [])`
	`78`	`+ public function log($level, $message, array $context = []): void`
`79`	`79`	`{`
`80`	`80`	`}`
`81`	`81`	`};`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public function testPrepareJsonSerializable(): void`
`53`	`53`	`$this->assertSame(`
`54`	`54`	`['a' => 1, 'b' => 'string'],`
`55`	`55`	`$this->prepareJsonData(new class () implements JsonSerializable {`
`56`		`- public function jsonSerialize()`
	`56`	`+ public function jsonSerialize(): array`
`57`	`57`	`{`
`58`	`58`	`return ['a' => 1, 'b' => 'string'];`
`59`	`59`	`}`