[PHP 8.4] Fixes for implicit nullability deprecation

src/ClassMapGenerator.php

@@ -61,7 +61,7 @@ public function __construct(array $extensions = ['php', 'inc'])
      *
      * @return $this
      */
-    public function avoidDuplicateScans(FileList $scannedFiles = null): self
+    public function avoidDuplicateScans(?FileList $scannedFiles = null): self
     {
         $this->scannedFiles = $scannedFiles ?? new FileList;
 
@@ -100,7 +100,7 @@ public function getClassMap(): ClassMap
      *
      * @throws \RuntimeException When the path is neither an existing file nor directory
      */
-    public function scanPaths($path, string $excluded = null, string $autoloadType = 'classmap', ?string $namespace = null): void
+    public function scanPaths($path, ?string $excluded = null, string $autoloadType = 'classmap', ?string $namespace = null): void
     {
         if (!in_array($autoloadType, ['psr-0', 'psr-4', 'classmap'], true)) {
             throw new \InvalidArgumentException('$autoloadType must be one of: "psr-0", "psr-4" or "classmap"');

src/PhpFileCleaner.php

@@ -99,8 +99,8 @@
                 }
 
                 if ($char === "<" && $this->peek('<') && $this->match('{<<<[ \t]*+([\'"]?)([a-zA-Z_\x80-\xff][a-zA-Z0-9_\x80-\xff]*+)\\1(?:\r\n|\n|\r)}A', $match)) {
                     $this->index += \strlen($match[0]);
                     $this->skipHeredoc($match[2]);
                     $clean .= 'null';
                     continue;
                 }
@@ -129,9 +129,9 @@
                 }
 
                 $this->index += 1;
                 if ($this->match(self::$restPattern, $match)) {
                     $clean .= $char . $match[0];
                     $this->index += \strlen($match[0]);
                 } else {
                     $clean .= $char;
                 }
@@ -240,8 +240,8 @@
      * @param non-empty-string $regex
      * @param null|array<int, string> $match
      */
-    private function match(string $regex, array &$match = null): bool
+    private function match(string $regex, ?array &$match = null): bool
     {
         return Preg::isMatch($regex, $this->contents, $match, 0, $this->index);
     }
 }