Upgrade to PHP 8.1 and higher.

Author: prwater

build.xml

@@ -1,14 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="php-helper-code-store-php" default="build"  basedir=".">
-    <target name="build"/>
-
-    <!-- Run composer update -->
+    <!-- Run composer update and executes various other updates -->
     <target name="update">
-        <exec command="composer update" checkreturn="true" passthru="true"/>
+        <exec executable="composer" checkreturn="true" passthru="true">
+            <arg value="--ansi"/>
+            <arg value="update"/>
+        </exec>
+
+        <phing phingfile="build.xml" target="outdated" haltonfailure="true"/>
+    </target>
+
+    <!-- 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 test" passthru="true" checkreturn="true"/>
+        <exec executable="bin/phpunit" passthru="true" checkreturn="true"/>
     </target>
-</project>
+
+    <target name="build" depends="update,unit"/>
+</project>

composer.json

@@ -9,12 +9,14 @@
   "type": "library",
   "license": "MIT",
   "require": {
-    "php": ">=7.4",
-    "setbased/helper-code-store": "^2.3.1"
+    "php": ">=8.1",
+    "setbased/helper-code-store": "^2.4.0"
   },
+  "minimum-stability": "dev",
+  "prefer-stable": true,
   "require-dev": {
-    "phpunit/phpunit": "^9.5.0",
-    "phing/phing": "^2.16.3"
+    "phing/phing": "^3.0.0-RC4",
+    "phpunit/phpunit": "^9.5.28"
   },
   "autoload": {
     "psr-4": {
@@ -28,6 +30,9 @@
   },
   "config": {
     "bin-dir": "bin/",
-    "sort-packages": true
+    "sort-packages": true,
+    "allow-plugins": {
+      "phing/phing-composer-configurator": true
+    }
   }
 }

src/Importing.php

@@ -14,28 +14,28 @@ class Importing
    *
    * @var array
    */
-  private $classes = [];
+  private array $classes = [];
 
   /**
    * The import statements.
    *
    * @var string[]
    */
-  private $imports;
+  private array $imports;
 
   /**
    * The namespace.
    *
    * @var string
    */
-  private $namespace;
+  private string $namespace;
 
   /**
-   * The replace pairs from fully qualified name to imported name.
+   * The replacement pairs from fully qualified name to imported name.
    *
    * @var array
    */
-  private $replace;
+  private array $replace;
 
   //--------------------------------------------------------------------------------------------------------------------
   /**
@@ -160,7 +160,7 @@ public function prepare(): void
 
   //--------------------------------------------------------------------------------------------------------------------
   /**
-   * Returns the replace pairs from fully qualified name to imported name.
+   * Returns the replacement pairs from fully qualified name to imported name.
    *
    * @return array
    */
@@ -186,7 +186,7 @@ public function simplyFullyQualifiedName(string $fullyQualifiedName): string
 
   //--------------------------------------------------------------------------------------------------------------------
   /**
-   * Returns true if and only if the a name space is the global or current namespace.
+   * Returns whether a name space is the global or current namespace.
    *
    * @param string $namespace The namespace.
    *
@@ -270,7 +270,7 @@ private function prepare1(array $rawImports): void
 
   //--------------------------------------------------------------------------------------------------------------------
   /**
-   * Prepares the replace pairs.
+   * Prepares the replacement pairs.
    *
    * @param array $rawImports The raw data about classes to import.
    */

src/PhpCodeStore.php

@@ -14,14 +14,14 @@ class PhpCodeStore extends CodeStore
    *
    * @var int[]
    */
-  private $defaultLevel = [];
+  private array $defaultLevel = [];
 
   /**
    * The heredoc identifier.
    *
    * @var string|null
    */
-  private $heredocIdentifier;
+  private ?string $heredocIdentifier = null;
 
   //--------------------------------------------------------------------------------------------------------------------
   /**
@@ -52,7 +52,7 @@ protected function indentationMode(string $line): int
 
     $mode |= $this->indentationModeHeredoc($line);
     $mode |= $this->indentationModeSwitch($line);
-    $mode |= $this->indentationModeBLock($line);
+    $mode |= $this->indentationModeBlock($line);
 
     return $mode;
   }
@@ -83,7 +83,7 @@ private function defaultLevelIncrement(): void
 
   //--------------------------------------------------------------------------------------------------------------------
   /**
-   * Returns true if the indent level of the current switch statement (if any) is zero. Otherwise, returns false.
+   * Returns whether the indent level of the current switch statement (if any) is zero.
    */
   private function defaultLevelIsZero(): bool
   {
@@ -104,14 +104,14 @@ private function indentationModeBlock(string $line): int
 
     if ($this->heredocIdentifier!==null) return $mode;
 
-    if (substr($line, -1, 1)=='{')
+    if (str_ends_with($line, '{'))
     {
       $mode |= self::C_INDENT_INCREMENT_AFTER;
 
       $this->defaultLevelIncrement();
     }
 
-    if (substr($line, 0, 1)=='}')
+    if (str_starts_with($line, '}'))
     {
       $this->defaultLevelDecrement();
 
@@ -132,6 +132,7 @@ private function indentationModeBlock(string $line): int
 
   //--------------------------------------------------------------------------------------------------------------------
   /**
+   * Returns the indentation mode based on a line of code starting a heredoc.
    *
    * @param string $line The line of code.
    *
@@ -176,19 +177,19 @@ private function indentationModeSwitch(string $line): int
 
     if ($this->heredocIdentifier!==null) return $mode;
 
-    if (substr($line, 0, 5)=='case ')
+    if (str_starts_with($line, 'case '))
     {
       $mode |= self::C_INDENT_INCREMENT_AFTER;
     }
 
-    if (substr($line, 0, 8)=='default:')
+    if (str_starts_with($line, 'default:'))
     {
       $this->defaultLevel[] = 0;
 
       $mode |= self::C_INDENT_INCREMENT_AFTER;
     }
 
-    if (substr($line, 0, 6)=='break;')
+    if (str_starts_with($line, 'break;'))
     {
       $mode |= self::C_INDENT_DECREMENT_AFTER;
     }