Merge pull request #1390 from Roave/renovate/all-minor-patch

Update all non-major dependencies
Roave · Jan 19, 2024 · f509e0b · f509e0b
2 parents bd4af33 + 5e4957b
commit f509e0b
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 22 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -93,7 +93,7 @@ jobs:
         dependencies:
           - "locked"
         php-version:
-          - "8.2"
+          - "8.3"
         operating-system:
           - "ubuntu-latest"
 

diff --git a/composer.json b/composer.json
@@ -36,8 +36,8 @@
         "doctrine/coding-standard": "^12.0.0",
         "phpstan/phpstan": "^1.10.56",
         "phpstan/phpstan-phpunit": "^1.3.15",
-        "phpunit/phpunit": "^10.5.7",
-        "vimeo/psalm": "5.19.1",
+        "phpunit/phpunit": "^10.5.8",
+        "vimeo/psalm": "5.20.0",
         "roave/infection-static-analysis-plugin": "^1.34.0"
     },
     "autoload": {

diff --git a/composer.lock b/composer.lock
diff --git a/src/Reflection/Adapter/ReflectionMethod.php b/src/Reflection/Adapter/ReflectionMethod.php
@@ -37,6 +37,7 @@ public function __construct(private BetterReflectionMethod $betterReflectionMeth
         unset($this->class);
     }
 
+    /** @psalm-suppress MethodSignatureMismatch */
     public static function createFromMethodName(string $method): static
     {
         if (! str_contains($method, '::')) {

diff --git a/src/Reflection/ReflectionClass.php b/src/Reflection/ReflectionClass.php
@@ -1410,7 +1410,7 @@ private function computeTraitsData(ClassNode|InterfaceNode|TraitNode|EnumNode $n
                 $methodHash = $this->methodHash($usedTrait->toString(), $adaptation->method->toString());
 
                 if ($adaptation instanceof Node\Stmt\TraitUseAdaptation\Alias) {
-                    if ($adaptation->newModifier) {
+                    if ($adaptation->newModifier !== null) {
                         /** @var int-mask-of<ReflectionMethodAdapter::IS_*> $modifier */
                         $modifier                             = $adaptation->newModifier;
                         $traitsData['modifiers'][$methodHash] = $modifier;

diff --git a/src/SourceLocator/SourceStubber/ReflectionSourceStubber.php b/src/SourceLocator/SourceStubber/ReflectionSourceStubber.php
@@ -52,6 +52,7 @@
 use function implode;
 use function in_array;
 use function is_resource;
+use function is_string;
 use function method_exists;
 use function preg_replace;
 use function sprintf;
@@ -120,7 +121,8 @@ public function generateClassStub(string $className): StubData|null
             ? $this->generateStubInNamespace($node, $classReflection->getNamespaceName())
             : $this->generateStub($node);
 
-        $extensionName = $classReflection->getExtensionName() ?: null;
+        $extensionName = $classReflection->getExtension()?->getName();
+        assert((is_string($extensionName) && $extensionName !== '') || $extensionName === null);
 
         return $this->createStubData($stub, $extensionName);
     }
@@ -147,7 +149,10 @@ public function generateFunctionStub(string $functionName): StubData|null
             $functionNode->setReturnType($this->formatType($returnType));
         }
 
-        $extensionName = $functionReflection->getExtensionName() ?: null;
+        /** @phpstan-ignore-next-line */
+        $extensionName = $functionReflection->getExtension()?->getName();
+        /** @phpstan-ignore-next-line */
+        assert((is_string($extensionName) && $extensionName !== '') || $extensionName === null);
 
         if (! $functionReflection->inNamespace()) {
             return $this->createStubData($this->generateStub($functionNode->getNode()), $extensionName);
@@ -214,7 +219,7 @@ private function addDocComment(
         Class_|Interface_|Trait_|Enum_|Method|Property|Function_ $node,
         CoreReflectionClass|CoreReflectionMethod|CoreReflectionProperty|CoreReflectionFunction $reflection,
     ): void {
-        $docComment  = $reflection->getDocComment() ?: '';
+        $docComment  = $reflection->getDocComment() !== false ? $reflection->getDocComment() : '';
         $annotations = [];
 
         if (

diff --git a/src/SourceLocator/Type/ComposerSourceLocator.php b/src/SourceLocator/Type/ComposerSourceLocator.php
@@ -42,7 +42,7 @@ protected function createLocatedSource(Identifier $identifier): LocatedSource|nu
 
         $filename = $this->classLoader->findFile($identifier->getName());
 
-        if (! $filename) {
+        if ($filename === false) {
             return null;
         }
 

diff --git a/src/SourceLocator/Type/EvaledCodeSourceLocator.php b/src/SourceLocator/Type/EvaledCodeSourceLocator.php
@@ -62,7 +62,7 @@ private function getInternalReflectionClass(Identifier $identifier): ReflectionC
         $reflection = new ReflectionClass($name);
         $sourceFile = $reflection->getFileName();
 
-        return $sourceFile && is_file($sourceFile)
+        return $sourceFile !== false && is_file($sourceFile)
             ? null : $reflection;
     }
 }
diff --git a/test/unit/SourceLocator/Type/ComposerSourceLocatorTest.php b/test/unit/SourceLocator/Type/ComposerSourceLocatorTest.php
@@ -66,7 +66,7 @@ public function testInvokableThrowsExceptionWhenClassNotResolved(): void
             ->expects($this->once())
             ->method('findFile')
             ->with($className)
-            ->will($this->returnValue(null));
+            ->willReturn(false);
 
         $locator = new ComposerSourceLocator($loader, $this->astLocator);