Merge pull request #456 from phpDocumentor/fix/invalid-fqsen-define

Fix: issue with invalid defines
phpDocumentor · Oct 9, 2023 · 99926d6 · 99926d6
2 parents 316073f + f66a2df
commit 99926d6
Show file tree

Hide file tree

Showing 6 changed files with 88 additions and 90 deletions.
diff --git a/composer.json b/composer.json
@@ -24,6 +24,7 @@
         "phpdocumentor/reflection-common": "^2.1",
         "phpdocumentor/reflection-docblock": "^5",
         "phpdocumentor/type-resolver": "^1.2",
+        "symfony/polyfill-php80": "^1.28",
         "webmozart/assert": "^1.7"
     },
     "require-dev": {

diff --git a/composer.lock b/composer.lock
diff --git a/rector.php b/rector.php
@@ -15,8 +15,6 @@
     // register a single rule
     $rectorConfig->rule(InlineConstructorDefaultToPropertyRector::class);
     $rectorConfig->rule(Rector\CodeQuality\Rector\Class_\CompleteDynamicPropertiesRector::class);
-    $rectorConfig->rule(Rector\TypeDeclaration\Rector\Closure\AddClosureReturnTypeRector::class);
-    $rectorConfig->rule(Rector\PHPUnit\Rector\Class_\AddProphecyTraitRector::class);
     $rectorConfig->importNames();
 
     // define sets of rules

diff --git a/src/phpDocumentor/Reflection/Php/Factory/Define.php b/src/phpDocumentor/Reflection/Php/Factory/Define.php
@@ -31,7 +31,6 @@
 
 use function assert;
 use function sprintf;
-use function strpos;
 
 /**
  * Strategy to convert `define` expressions to ConstantElement
@@ -145,7 +144,7 @@ private function fqsenFromExpression(Expr $nameString, ContextStack $context): ?
 
     private function fqsenFromString(string $nameString): Fqsen
     {
-        if (strpos($nameString, '\\') === false) {
+        if (str_starts_with($nameString, '\\') === false) {
             return new Fqsen(sprintf('\\%s', $nameString));
         }
 

diff --git a/tests/integration/ProjectCreationTest.php b/tests/integration/ProjectCreationTest.php
@@ -206,7 +206,7 @@ public function testWithGlobalConstants() : void
         $this->assertArrayHasKey('\\Luigi\\OVEN_TEMPERATURE', $project->getFiles()[$fileName]->getConstants());
         $this->assertArrayHasKey('\\Luigi\\MAX_OVEN_TEMPERATURE', $project->getFiles()[$fileName]->getConstants());
         $this->assertArrayHasKey('\\OUTSIDE_OVEN_TEMPERATURE', $project->getFiles()[$fileName]->getConstants());
-        $this->assertArrayHasKey('\\Luigi_OUTSIDE_OVEN_TEMPERATURE', $project->getFiles()[$fileName]->getConstants());
+        $this->assertArrayHasKey('\\LuigiFoo\\_OUTSIDE_OVEN_TEMPERATURE', $project->getFiles()[$fileName]->getConstants());
     }
 
     public function testInterfaceExtends() : void

diff --git a/tests/integration/data/Luigi/constants.php b/tests/integration/data/Luigi/constants.php
@@ -5,7 +5,7 @@
 const OVEN_TEMPERATURE = 9001;
 define('\\Luigi\\MAX_OVEN_TEMPERATURE', 9002);
 define('OUTSIDE_OVEN_TEMPERATURE', 9002);
-define(__NAMESPACE__ . '_OUTSIDE_OVEN_TEMPERATURE', 9002);
+define(__NAMESPACE__ . 'Foo\\_OUTSIDE_OVEN_TEMPERATURE', 9002);
 $v = 1;
 define($v . '_OUTSIDE_OVEN_TEMPERATURE', 9002);