Support for PHP 8.3 and 8.4 only.

prwater · prwater · commit 022257461ca3 · 2025-06-08T06:11:29.000+02:00
diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml
@@ -16,9 +16,8 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "8.1"
-          - "8.2"
           - "8.3"
+          - "8.4"
 
     steps:
       - name: "Checkout"
diff --git a/.gitignore b/.gitignore
@@ -2,8 +2,6 @@
 /.phpunit.result.cache
 /bin/
 /composer.lock
-/custom.task.properties
-/custom.type.properties
 /test/coverage.xml
 /test/report/
 /vendor/
diff --git a/build.xml b/build.xml
@@ -33,5 +33,5 @@
         <exec executable="bin/phpunit" passthru="true" checkreturn="true"/>
     </target>
 
-    <target name="build"/>
+    <target name="build" depends="update,unit"/>
 </project>
diff --git a/composer.json b/composer.json
@@ -8,19 +8,17 @@
   ],
   "license": "MIT",
   "require": {
-    "php": ">=8.1",
+    "php": ">=8.3",
     "ext-mbstring": "*",
     "plaisio/error-logger": "^1.3.0",
     "plaisio/helper-html": "^4.1.0",
-    "plaisio/var-dumper": "^1.4.0",
-    "plaisio/var-dumper-writer": "^3.0.0"
+    "plaisio/var-dumper": "^1.54.0",
+    "plaisio/var-dumper-writer": "^3.1.0"
   },
-  "minimum-stability": "dev",
-  "prefer-stable": true,
   "require-dev": {
     "ext-mysqli": "*",
-    "phing/phing": "^3.0.0-RC4",
-    "phpunit/phpunit": "^9.6.3"
+    "phing/phing": "^3.0.1",
+    "phpunit/phpunit": "^11.5.22"
   },
   "autoload": {
     "psr-4": {
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,21 +1,20 @@
-<?xml version="1.0"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="test/bootstrap.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-  <coverage processUncoveredFiles="true">
-    <include>
-      <directory suffix=".php">src</directory>
-    </include>
-    <exclude>
-      <directory suffix=".php">vendor/setbased</directory>
-    </exclude>
-    <report>
-      <clover outputFile="test/coverage.xml"/>
-      <html outputDirectory="test/report"/>
-    </report>
-  </coverage>
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         displayDetailsOnTestsThatTriggerDeprecations="true"
+         displayDetailsOnTestsThatTriggerErrors="true"
+         displayDetailsOnTestsThatTriggerNotices="true"
+         displayDetailsOnTestsThatTriggerWarnings="true"
+         displayDetailsOnPhpunitDeprecations="true">
   <testsuites>
-    <testsuite name="Tests">
+    <testsuite name="default">
       <directory>test</directory>
     </testsuite>
   </testsuites>
-  <logging/>
+
+  <source ignoreIndirectDeprecations="true" restrictNotices="true" restrictWarnings="true">
+    <include>
+      <directory>src</directory>
+    </include>
+  </source>
 </phpunit>
diff --git a/src/CoreErrorLogger.php b/src/CoreErrorLogger.php
@@ -95,7 +95,7 @@ public function logError(\Throwable $throwable): void
       $this->echoPageTrailer();
       $this->closeStream();
     }
-    catch (\Throwable $throwable)
+    catch (\Throwable)
     {
       // Nothing to do.
     }
@@ -119,7 +119,10 @@ abstract protected function closeStream(): void;
   protected function echoErrorLog(?\Throwable $throwable, bool $isPrevious = false): void
   {
     // Return immediately if there is not throwable.
-    if ($throwable===null) return;
+    if ($throwable===null)
+    {
+      return;
+    }
 
     if (!$isPrevious)
     {
@@ -422,7 +425,10 @@ private function echoTraceStack(\Throwable $throwable): void
     $trace = $throwable->getTrace();
 
     // Return immediately if the trace is empty.
-    if (empty($trace)) return;
+    if (empty($trace))
+    {
+      return;
+    }
 
     fwrite($this->handle, '<div class="trace">');
     fwrite($this->handle, '<h2>Stack Trace</h2>');
@@ -443,7 +449,10 @@ private function echoTraceStack(\Throwable $throwable): void
   private function echoVarDump(): void
   {
     // Return immediately if there are no variables to dump.
-    if ($this->dump===null) return;
+    if ($this->dump===null)
+    {
+      return;
+    }
 
     fwrite($this->handle, Html::htmlNested(['tag'  => 'h2',
                                             'text' => 'VarDump']));
diff --git a/src/DevelopmentErrorLogger.php b/src/DevelopmentErrorLogger.php
@@ -11,20 +11,20 @@ class DevelopmentErrorLogger extends CoreErrorLogger
 {
   //--------------------------------------------------------------------------------------------------------------------
   /**
-   * Opens output.
+   * {@inheritdoc}
    */
-  protected function openStream(): void
+  protected function closeStream(): void
   {
-    $this->handle = fopen('php://output', 'wb');
+    fclose($this->handle);
   }
 
   //--------------------------------------------------------------------------------------------------------------------
   /**
-   * {@inheritdoc}
+   * Opens output.
    */
-  protected function closeStream(): void
+  protected function openStream(): void
   {
-    fclose($this->handle);
+    $this->handle = fopen('php://output', 'wb');
   }
 
   //--------------------------------------------------------------------------------------------------------------------
diff --git a/src/HtmlVarWriter.php b/src/HtmlVarWriter.php
@@ -250,10 +250,10 @@ private function writeName(mixed $name, ?int $id = null): void
       elseif (is_string($name))
       {
         $class = 'string';
-        $text  = mb_strimwidth((string)$name, 0, 20, '...');
+        $text  = mb_strimwidth($name, 0, 20, '...');
         if ($text!=$name)
         {
-          $title = mb_strimwidth((string)$name, 0, 512, '...');
+          $title = mb_strimwidth($name, 0, 512, '...');
         }
       }
       else
@@ -285,7 +285,12 @@ private function writeName(mixed $name, ?int $id = null): void
    * @param string          $class The class of the value.
    * @param string|null     $title The title for the value.
    */
-  private function writeScalar(?int $id, ?int $ref, mixed $name, string $text, string $class, ?string $title = null)
+  private function writeScalar(?int    $id,
+                               ?int    $ref,
+                               mixed   $name,
+                               string  $text,
+                               string  $class,
+                               ?string $title = null): void
   {
     $html = Html::htmlNested(['tag'  => 'span',
                               'attr' => ['class' => $class, 'title' => $title],
diff --git a/test/CoreErrorLoggerTest.php b/test/CoreErrorLoggerTest.php
@@ -33,6 +33,8 @@ public function setUp(): void
   {
     parent::setUp();
 
+    ini_set('zend.exception_ignore_args', false);
+
     $this->errorLogger = new TestErrorLogger();
   }
 

Original file line number	Diff line number	Diff line change
`@@ -11,20 +11,20 @@ class DevelopmentErrorLogger extends CoreErrorLogger`
`11`	`11`	`{`
`12`	`12`	`//--------------------------------------------------------------------------------------------------------------------`
`13`	`13`	`/**`
`14`		`- * Opens output.`
	`14`	`+ * {@inheritdoc}`
`15`	`15`	`*/`
`16`		`- protected function openStream(): void`
	`16`	`+ protected function closeStream(): void`
`17`	`17`	`{`
`18`		`- $this->handle = fopen('php://output', 'wb');`
	`18`	`+ fclose($this->handle);`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`//--------------------------------------------------------------------------------------------------------------------`
`22`	`22`	`/**`
`23`		`- * {@inheritdoc}`
	`23`	`+ * Opens output.`
`24`	`24`	`*/`
`25`		`- protected function closeStream(): void`
	`25`	`+ protected function openStream(): void`
`26`	`26`	`{`
`27`		`- fclose($this->handle);`
	`27`	`+ $this->handle = fopen('php://output', 'wb');`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`//--------------------------------------------------------------------------------------------------------------------`
Original file line number	Diff line number	Diff line change
`@@ -250,10 +250,10 @@ private function writeName(mixed $name, ?int $id = null): void`
`250`	`250`	`elseif (is_string($name))`
`251`	`251`	`{`
`252`	`252`	`$class = 'string';`
`253`		`- $text = mb_strimwidth((string)$name, 0, 20, '...');`
	`253`	`+ $text = mb_strimwidth($name, 0, 20, '...');`
`254`	`254`	`if ($text!=$name)`
`255`	`255`	`{`
`256`		`- $title = mb_strimwidth((string)$name, 0, 512, '...');`
	`256`	`+ $title = mb_strimwidth($name, 0, 512, '...');`
`257`	`257`	`}`
`258`	`258`	`}`
`259`	`259`	`else`
`@@ -285,7 +285,12 @@ private function writeName(mixed $name, ?int $id = null): void`
`285`	`285`	`* @param string $class The class of the value.`
`286`	`286`	`* @param string\|null $title The title for the value.`
`287`	`287`	`*/`
`288`		`- private function writeScalar(?int $id, ?int $ref, mixed $name, string $text, string $class, ?string $title = null)`
	`288`	`+ private function writeScalar(?int $id,`
	`289`	`+ ?int $ref,`
	`290`	`+ mixed $name,`
	`291`	`+ string $text,`
	`292`	`+ string $class,`
	`293`	`+ ?string $title = null): void`
`289`	`294`	`{`
`290`	`295`	`$html = Html::htmlNested(['tag' => 'span',`
`291`	`296`	`'attr' => ['class' => $class, 'title' => $title],`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,8 @@ public function setUp(): void`
`33`	`33`	`{`
`34`	`34`	`parent::setUp();`
`35`	`35`
	`36`	`+ ini_set('zend.exception_ignore_args', false);`
	`37`	`+`
`36`	`38`	`$this->errorLogger = new TestErrorLogger();`
`37`	`39`	`}`
`38`	`40`