Merge pull request #1413 from staabm/dep-fix

Ocramius · web-flow · commit 37e990fd17ca · 2024-03-23T16:49:15.000+01:00
Fix non-version dependent deprecations
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());
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -692,12 +692,10 @@ private function isDeprecatedByPhpDocInPhpVersion(Node\Expr\FuncCall $node): boo`
`692`	`692`	`$patch = $matches[3] ?? 0;`
`693`	`693`	`$versionId = sprintf('%d%02d%02d', $major, $minor, $patch);`
`694`	`694`
`695`		`- if ($this->phpVersion >= $versionId) {`
`696`		`- return true;`
`697`		`- }`
	`695`	`+ return $this->phpVersion >= $versionId;`
`698`	`696`	`}`
`699`	`697`
`700`		`- return false;`
	`698`	`+ return true;`
`701`	`699`	`}`
`702`	`700`
`703`	`701`	`private function isDeprecatedInPhpVersion(Node\Stmt\ClassLike\|Node\Stmt\ClassConst\|Node\Stmt\Property\|Node\Stmt\ClassMethod\|Node\Stmt\Function_ $node): bool`
Original file line number	Diff line number	Diff line change
`@@ -338,4 +338,13 @@ public function testIsDeprecated(string $docComment, bool $isDeprecated): void`
`338`	`338`
`339`	`339`	`self::assertSame($isDeprecated, $constantReflection->isDeprecated());`
`340`	`340`	`}`
	`341`	`+`
	`342`	`+ public function testIsCurloptFtpSslConstantDeprecated(): void`
	`343`	`+ {`
	`344`	`+ $betterReflection = BetterReflectionSingleton::instance();`
	`345`	`+ $reflector = new DefaultReflector($betterReflection->sourceLocator());`
	`346`	`+ $constantReflection = $reflector->reflectConstant('CURLOPT_FTP_SSL');`
	`347`	`+`
	`348`	`+ self::assertTrue($constantReflection->isDeprecated());`
	`349`	`+ }`
`341`	`350`	`}`