Merge pull request #1413 from staabm/dep-fix

Fix non-version dependent deprecations
Roave · Mar 23, 2024 · 37e990f · 37e990f
2 parents 1926b26 + 3fb2a1c
commit 37e990f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/SourceLocator/SourceStubber/PhpStormStubsSourceStubber.php b/src/SourceLocator/SourceStubber/PhpStormStubsSourceStubber.php
@@ -692,12 +692,10 @@ private function isDeprecatedByPhpDocInPhpVersion(Node\Expr\FuncCall $node): boo
             $patch     = $matches[3] ?? 0;
             $versionId = sprintf('%d%02d%02d', $major, $minor, $patch);
 
-            if ($this->phpVersion >= $versionId) {
-                return true;
-            }
+            return $this->phpVersion >= $versionId;
         }
 
-        return false;
+        return true;
     }
 
     private function isDeprecatedInPhpVersion(Node\Stmt\ClassLike|Node\Stmt\ClassConst|Node\Stmt\Property|Node\Stmt\ClassMethod|Node\Stmt\Function_ $node): bool

diff --git a/test/unit/Reflection/ReflectionConstantTest.php b/test/unit/Reflection/ReflectionConstantTest.php
@@ -338,4 +338,13 @@ public function testIsDeprecated(string $docComment, bool $isDeprecated): void
 
         self::assertSame($isDeprecated, $constantReflection->isDeprecated());
     }
+
+    public function testIsCurloptFtpSslConstantDeprecated(): void
+    {
+        $betterReflection   = BetterReflectionSingleton::instance();
+        $reflector          = new DefaultReflector($betterReflection->sourceLocator());
+        $constantReflection = $reflector->reflectConstant('CURLOPT_FTP_SSL');
+
+        self::assertTrue($constantReflection->isDeprecated());
+    }
 }