Update all dependencies

.github/workflows/continuous-integration.yml

@@ -109,8 +109,7 @@ jobs:
         dependencies:
           - "locked"
         php-version:
-          # Throws deprecated errors on 8.4
-          - "8.3"
+          - "8.4"
         operating-system:
           - "ubuntu-latest"
 
@@ -151,8 +150,7 @@ jobs:
         dependencies:
           - "locked"
         php-version:
-            # Does not work on 8.4
-          - "8.3"
+          - "8.4"
         operating-system:
           - "ubuntu-latest"
 

composer.json

@@ -32,8 +32,8 @@
 
     ],
     "require-dev": {
-        "phpbench/phpbench": "^1.3.1",
-        "phpunit/phpunit": "^11.5.3"
+        "phpbench/phpbench": "^1.4.0",
+        "phpunit/phpunit": "^11.5.4"
     },
     "autoload": {
         "psr-4": {

src/Reflection/Adapter/ReflectionMethod.php

@@ -37,7 +37,6 @@ public function __construct(private BetterReflectionMethod $betterReflectionMeth
         unset($this->class);
     }
 
-    /** @psalm-suppress MethodSignatureMismatch */
     public static function createFromMethodName(string $method): static
     {
         if (! str_contains($method, '::')) {

src/Reflection/Adapter/ReflectionProperty.php

@@ -193,7 +193,11 @@ public function isDynamic(): bool
         return $this->betterReflectionProperty->isDynamic();
     }
 
-    /** @psalm-mutation-free */
+    /**
+     * @return int-mask-of<self::IS_*>
+     *
+     * @psalm-mutation-free
+     */
     public function getModifiers(): int
     {
         return $this->betterReflectionProperty->getModifiers();
@@ -286,16 +290,14 @@ public function hasHooks(): bool
         return $this->betterReflectionProperty->hasHooks();
     }
 
-    /** @psalm-suppress UndefinedClass */
-    public function hasHook(PropertyHookType $hookType): bool
+    public function hasHook(PropertyHookType $type): bool
     {
-        return $this->betterReflectionProperty->hasHook(BetterReflectionPropertyHookType::fromCoreReflectionPropertyHookType($hookType));
+        return $this->betterReflectionProperty->hasHook(BetterReflectionPropertyHookType::fromCoreReflectionPropertyHookType($type));
     }
 
-    /** @psalm-suppress UndefinedClass */
-    public function getHook(PropertyHookType $hookType): ReflectionMethod|null
+    public function getHook(PropertyHookType $type): ReflectionMethod|null
     {
-        $hook = $this->betterReflectionProperty->getHook(BetterReflectionPropertyHookType::fromCoreReflectionPropertyHookType($hookType));
+        $hook = $this->betterReflectionProperty->getHook(BetterReflectionPropertyHookType::fromCoreReflectionPropertyHookType($type));
         if ($hook === null) {
             return null;
         }

src/Reflection/ReflectionPropertyHookType.php

@@ -19,7 +19,6 @@ enum ReflectionPropertyHookType: string
     case Get = 'get';
     case Set = 'set';
 
-    /** @psalm-suppress UndefinedClass */
     public static function fromCoreReflectionPropertyHookType(CoreReflectionPropertyHookType $hookType): self
     {
         /** @phpstan-ignore match.unhandled */

src/Reflection/StringCast/ReflectionClassStringCast.php

@@ -201,9 +201,11 @@ private static function methodsToString(array $methods, int $emptyLinesAmongItem
      */
     private static function itemsToString(array $items, int $emptyLinesAmongItems = 1): string
     {
-        $string = implode(str_repeat("\n", $emptyLinesAmongItems), $items);
+        $string         = implode(str_repeat("\n", $emptyLinesAmongItems), $items);
+        $indentedString = preg_replace('/(^|\n)(?!\n)/', '\1' . self::indent(), $string);
+        assert($indentedString !== null);
 
-        return "\n" . preg_replace('/(^|\n)(?!\n)/', '\1' . self::indent(), $string);
+        return "\n" . $indentedString;
     }
 
     /** @psalm-pure */

src/Reflection/StringCast/ReflectionStringCastHelper.php

@@ -8,6 +8,7 @@
 use Roave\BetterReflection\Reflection\ReflectionEnumCase;
 use Roave\BetterReflection\Reflection\ReflectionProperty;
 
+use function assert;
 use function preg_replace;
 
 /** @internal */
@@ -22,6 +23,9 @@ public static function docCommentToString(ReflectionProperty|ReflectionClassCons
             return '';
         }
 
-        return ($indent ? preg_replace('/(\n)(?!\n)/', '\1    ', $docComment) : $docComment) . "\n";
+        $indentedDocComment = $indent ? preg_replace('/(\n)(?!\n)/', '\1    ', $docComment) : $docComment;
+        assert($indentedDocComment !== null);
+
+        return $indentedDocComment . "\n";
     }
 }

src/SourceLocator/SourceStubber/PhpStormStubsSourceStubber.php

@@ -340,8 +340,11 @@ private function parseFile(string $filePath): void
         $absoluteFilePath = $this->getAbsoluteFilePath($filePath);
         FileChecker::assertReadableFile($absoluteFilePath);
 
+        $fileContents = file_get_contents($absoluteFilePath);
+        assert($fileContents !== false);
+
         /** @var list<Node\Stmt> $ast */
-        $ast = $this->phpParser->parse(file_get_contents($absoluteFilePath));
+        $ast = $this->phpParser->parse($fileContents);
 
         // "@since" and "@removed" annotations in some cases do not contain a PHP version, but an extension version - e.g. "@since 1.3.0"
         // So we check PHP version only for stubs of core extensions
@@ -664,6 +667,7 @@ private function addAnnotationToDocComment(
             $docCommentText = sprintf('/** @%s */', $annotationName);
         } else {
             $docCommentText = preg_replace('~(\r?\n\s*)\*/~', sprintf('\1* @%s\1*/', $annotationName), $docComment->getText());
+            assert($docCommentText !== null);
         }
 
         $node->setDocComment(new Doc($docCommentText));
@@ -679,6 +683,8 @@ private function removeAnnotationFromDocComment(
         }
 
         $docCommentText = preg_replace('~@' . $annotationName . '.*$~m', '', $docComment->getText());
+        assert($docCommentText !== null);
+
         $node->setDocComment(new Doc($docCommentText));
     }
 

src/SourceLocator/SourceStubber/ReflectionSourceStubber.php

@@ -239,6 +239,7 @@ private function addDocComment(
             $docComment = sprintf("/**\n* %s\n*/", implode("\n *", $annotations));
         } elseif ($annotations !== []) {
             $docComment = preg_replace('~\s+\*/$~', sprintf("\n* %s\n*/", implode("\n *", $annotations)), $docComment);
+            assert($docComment !== null);
         }
 
         $node->setDocComment(new Doc($docComment));

src/SourceLocator/Type/AnonymousClassObjectSourceLocator.php

@@ -119,6 +119,8 @@ public function getAnonymousClassNode(): Class_
         };
 
         $fileContents = file_get_contents($fileName);
+        assert($fileContents !== false);
+
         /** @var list<Node\Stmt> $ast */
         $ast = $this->parser->parse($fileContents);
 

src/SourceLocator/Type/AutoloadSourceLocator.php

@@ -86,17 +86,20 @@
             return null;
         }
 
+        $fileContents = file_get_contents($locatedData['fileName']);
+        assert($fileContents !== false);
+
         if (strtolower($identifier->getName()) !== strtolower($locatedData['name'])) {
             return new AliasLocatedSource(
-                file_get_contents($locatedData['fileName']),
+                $fileContents,
                 $locatedData['name'],
                 $locatedData['fileName'],
                 $identifier->getName(),
             );
         }
 
         return new LocatedSource(
-            file_get_contents($locatedData['fileName']),
+            $fileContents,
             $identifier->getName(),
             $locatedData['fileName'],
         );
@@ -198,7 +201,7 @@
 
     private function silenceErrors(): void
     {
         set_error_handler(static fn (): bool => true);
     }
 
     /**
@@ -266,8 +269,11 @@
                 continue;
             }
 
+            $fileContents = file_get_contents($includedFileName);
+            assert($fileContents !== false);
+
             /** @var list<Node\Stmt> $ast */
-            $ast = $this->phpParser->parse(file_get_contents($includedFileName));
+            $ast = $this->phpParser->parse($fileContents);
 
             $this->nodeTraverser->traverse($ast);
 

src/SourceLocator/Type/ClosureSourceLocator.php

@@ -145,6 +145,8 @@ public function getClosureNodes(): array
         };
 
         $fileContents = file_get_contents($fileName);
+        assert($fileContents !== false);
+
         /** @var list<Node\Stmt> $ast */
         $ast = $this->parser->parse($fileContents);
 

src/SourceLocator/Type/Composer/PsrAutoloaderLocator.php

@@ -17,6 +17,7 @@
 use Roave\BetterReflection\SourceLocator\Type\DirectoriesSourceLocator;
 use Roave\BetterReflection\SourceLocator\Type\SourceLocator;
 
+use function assert;
 use function file_get_contents;
 
 final class PsrAutoloaderLocator implements SourceLocator
@@ -31,11 +32,13 @@ public function locateIdentifier(Reflector $reflector, Identifier $identifier):
         foreach ($this->mapping->resolvePossibleFilePaths($identifier) as $file) {
             try {
                 FileChecker::assertReadableFile($file);
+                $fileContents = file_get_contents($file);
+                assert($fileContents !== false);
 
                 return $this->astLocator->findReflection(
                     $reflector,
                     new LocatedSource(
-                        file_get_contents($file),
+                        $fileContents,
                         $identifier->getName(),
                         $file,
                     ),

src/SourceLocator/Type/ComposerSourceLocator.php

@@ -12,6 +12,7 @@
 use Roave\BetterReflection\SourceLocator\Exception\InvalidFileLocation;
 use Roave\BetterReflection\SourceLocator\Located\LocatedSource;
 
+use function assert;
 use function file_get_contents;
 
 /**
@@ -46,8 +47,11 @@ protected function createLocatedSource(Identifier $identifier): LocatedSource|nu
             return null;
         }
 
+        $fileContents = file_get_contents($filename);
+        assert($fileContents !== false);
+
         return new LocatedSource(
-            file_get_contents($filename),
+            $fileContents,
             $identifier->getName(),
             $filename,
         );

src/SourceLocator/Type/SingleFileSourceLocator.php

@@ -11,6 +11,7 @@
 use Roave\BetterReflection\SourceLocator\FileChecker;
 use Roave\BetterReflection\SourceLocator\Located\LocatedSource;
 
+use function assert;
 use function file_get_contents;
 
 /**
@@ -43,8 +44,11 @@ public function __construct(private string $fileName, Locator $astLocator)
      */
     protected function createLocatedSource(Identifier $identifier): LocatedSource|null
     {
+        $fileContents = file_get_contents($this->fileName);
+        assert($fileContents !== false);
+
         return new LocatedSource(
-            file_get_contents($this->fileName),
+            $fileContents,
             $identifier->getName(),
             $this->fileName,
         );

tools/composer.json

@@ -3,9 +3,9 @@
         "doctrine/coding-standard": "^12.0.0",
         "phpstan/phpstan": "^2.1.2",
         "phpstan/phpstan-phpunit": "^2.0.4",
-        "vimeo/psalm": "^5.26.1",
-        "roave/backward-compatibility-check": "^8.10.0",
-        "roave/infection-static-analysis-plugin": "^1.35.0"
+        "vimeo/psalm": "^6.4.0",
+        "roave/backward-compatibility-check": "^8.13.0",
+        "roave/infection-static-analysis-plugin": "^1.36.0"
     },
     "config": {
         "allow-plugins": {