Upgrade to PHP 8.1 and higher.

Author: prwater

build.xml

@@ -1,15 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="php-affirm" default="build" basedir=".">
-    <target name="build">
+    <!-- Run composer update and executes various other updates -->
+    <target name="update">
+        <exec executable="composer" checkreturn="true" passthru="true">
+            <arg value="--ansi"/>
+            <arg value="update"/>
+        </exec>
+
+        <phing phingfile="build.xml" target="outdated" haltonfailure="true"/>
     </target>
 
-    <!-- Run composer update -->
-    <target name="update">
-        <exec command="composer update" checkreturn="true" passthru="true"/>
+    <!-- Show outdated packages -->
+    <target name="outdated">
+        <exec executable="composer" checkreturn="false" passthru="true">
+            <arg value="--ansi"/>
+            <arg value="outdated"/>
+            <arg value="--direct"/>
+        </exec>
     </target>
 
     <!-- Runs all unit tests -->
     <target name="unit">
-        <exec command="bin/phpunit" passthru="true" checkreturn="true"/>
+        <exec executable="bin/phpunit" passthru="true" checkreturn="true"/>
     </target>
+
+    <target name="build" depends="update,unit"/>
 </project>

composer.json

@@ -7,12 +7,14 @@
   ],
   "license": "MIT",
   "require": {
-    "php": ">=7.3",
-    "setbased/exception": "^2.1"
+    "php": ">=8.1",
+    "setbased/exception": "^2.3.0"
   },
+  "minimum-stability": "dev",
+  "prefer-stable": true,
   "require-dev": {
-    "phing/phing": "^2.0",
-    "phpunit/phpunit": "^9.0"
+    "phing/phing": "^3.0.0-RC4",
+    "phpunit/phpunit": "^9.5.28"
   },
   "autoload": {
     "psr-4": {
@@ -25,6 +27,9 @@
     }
   },
   "config": {
-    "bin-dir": "bin"
+    "bin-dir": "bin",
+    "allow-plugins": {
+      "phing/phing-composer-configurator": true
+    }
   }
 }

src/ErrorHandler.php

@@ -27,7 +27,8 @@ class ErrorHandler
    */
   public function handleError(int $errno, string $errstr, ?string $errfile, ?int $errline): bool
   {
-    if (error_reporting()===0)
+    // See https://www.php.net/manual/en/language.operators.errorcontrol.php for the bitwise or expression.
+    if (error_reporting()===(E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR | E_USER_ERROR | E_RECOVERABLE_ERROR | E_PARSE))
     {
       // Error was suppressed with the @-operator. Don't throw an exception.
       return false;
@@ -71,7 +72,7 @@ public function handleError(int $errno, string $errstr, ?string $errfile, ?int $
    * @param null|int $errorTypes The mask for triggering this error handler. Defaults to E_ALL. Note E_STRICT is part
    *                             of E_ALL since PHP 5.4.0.
    */
-  public function registerErrorHandler($errorTypes = E_ALL)
+  public function registerErrorHandler(?int $errorTypes = E_ALL): void
   {
     ini_set('display_errors', '0');
     set_error_handler([$this, 'handleError'], $errorTypes);
@@ -81,7 +82,7 @@ public function registerErrorHandler($errorTypes = E_ALL)
   /**
    * Unregisters this error handler by restoring the PHP error and exception handlers.
    */
-  public function unregisterErrorHandler()
+  public function unregisterErrorHandler(): void
   {
     restore_error_handler();
   }

test/ErrorHandlerTest.php

@@ -16,9 +16,9 @@ class ErrorHandlerTest extends TestCase
   /**
    * The error handler.
    *
-   * @var ErrorHandler
+   * @var ErrorHandler|null
    */
-  private $errorHandler;
+  private ?ErrorHandler $errorHandler = null;
 
   //--------------------------------------------------------------------------------------------------------------------
   /**
@@ -37,7 +37,7 @@ public function __toString(): string
    *
    * @param \Exception $exception The exception
    */
-  public function exceptionHandler($exception)
+  public function exceptionHandler(\Exception $exception): void
   {
     self::assertInstanceOf(ErrorException::class, $exception);
   }
@@ -68,7 +68,7 @@ public function tearDown(): void
   /**
    * Errors suppressed with the @-operator must not throw exceptions.
    */
-  public function testSuppressedError()
+  public function testSuppressedError(): void
   {
     $handle = @fopen(__DIR__.'/not-found.txt', 'r');
     self::assertFalse($handle);
@@ -78,7 +78,7 @@ public function testSuppressedError()
   /**
    * Test when __toString fails.
    */
-  public function testToString1()
+  public function testToString1(): void
   {
     $tmp = (string)$this;
     self::assertSame('__toString', $tmp);
@@ -88,7 +88,7 @@ public function testToString1()
   /**
    * Test when __toString fails.
    */
-  public function testToString2()
+  public function testToString2(): void
   {
     set_exception_handler([$this, 'exceptionHandler']);
     $tmp = (string)$this;
@@ -97,9 +97,9 @@ public function testToString2()
 
   //--------------------------------------------------------------------------------------------------------------------
   /**
-   * Test E_WARNING when opening a non existing file throws an exception.
+   * Test E_WARNING when opening a non-existing file throws an exception.
    */
-  public function testWarning()
+  public function testWarning(): void
   {
     $this->expectException(ErrorException::class);
     $this->expectExceptionCode(E_WARNING);