bug #60909 [TypeInfo] use an EOL-agnostic approach to parse class uses (xabbuh)

stof · stof · commit cf0e627ffe96 · 2025-06-27T14:45:09.000+02:00
This PR was merged into the 7.2 branch. Discussion ---------- [TypeInfo] use an EOL-agnostic approach to parse class uses | Q | A | ------------- | --- | Branch? | 7.2 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #60906 | License | MIT Commits ------- d7eedcf use an EOL-agnostic approach to parse class uses
diff --git a/src/Symfony/Component/TypeInfo/.gitattributes b/src/Symfony/Component/TypeInfo/.gitattributes
@@ -1,3 +1,4 @@
 /Tests export-ignore
+/Tests/Fixtures/DummyWithUsesWindowsLineEndings.php text eol=crlf
 /phpunit.xml.dist export-ignore
 /.git* export-ignore
diff --git a/src/Symfony/Component/TypeInfo/Tests/Fixtures/DummyWithUsesWindowsLineEndings.php b/src/Symfony/Component/TypeInfo/Tests/Fixtures/DummyWithUsesWindowsLineEndings.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Symfony\Component\TypeInfo\Tests\Fixtures;
+
+use Symfony\Component\TypeInfo\Type;
+use \DateTimeInterface;
+use \DateTimeImmutable as DateTime;
+
+final class DummyWithUsesWindowsLineEndings
+{
+    private DateTimeInterface $createdAt;
+
+    public function setCreatedAt(DateTime $createdAt): void
+    {
+        $this->createdAt = $createdAt;
+    }
+
+    public function getType(): Type
+    {
+        throw new \LogicException('Should not be called.');
+    }
+}
diff --git a/src/Symfony/Component/TypeInfo/Tests/TypeContext/TypeContextFactoryTest.php b/src/Symfony/Component/TypeInfo/Tests/TypeContext/TypeContextFactoryTest.php
@@ -16,6 +16,7 @@
 use Symfony\Component\TypeInfo\Tests\Fixtures\Dummy;
 use Symfony\Component\TypeInfo\Tests\Fixtures\DummyWithTemplates;
 use Symfony\Component\TypeInfo\Tests\Fixtures\DummyWithUses;
+use Symfony\Component\TypeInfo\Tests\Fixtures\DummyWithUsesWindowsLineEndings;
 use Symfony\Component\TypeInfo\Type;
 use Symfony\Component\TypeInfo\TypeContext\TypeContextFactory;
 use Symfony\Component\TypeInfo\TypeResolver\StringTypeResolver;
@@ -82,6 +83,24 @@ public function testCollectUses()
         $this->assertEquals($uses, $this->typeContextFactory->createFromReflection(new \ReflectionParameter([DummyWithUses::class, 'setCreatedAt'], 'createdAt'))->uses);
     }
 
+    public function testCollectUsesWindowsLineEndings()
+    {
+        self::assertSame(\count(file(__DIR__.'/../Fixtures/DummyWithUsesWindowsLineEndings.php')), substr_count(file_get_contents(__DIR__.'/../Fixtures/DummyWithUsesWindowsLineEndings.php'), "\r\n"));
+
+        $uses = [
+            'Type' => Type::class,
+            \DateTimeInterface::class => '\\'.\DateTimeInterface::class,
+            'DateTime' => '\\'.\DateTimeImmutable::class,
+        ];
+
+        $this->assertSame($uses, $this->typeContextFactory->createFromClassName(DummyWithUsesWindowsLineEndings::class)->uses);
+
+        $this->assertEquals($uses, $this->typeContextFactory->createFromReflection(new \ReflectionClass(DummyWithUsesWindowsLineEndings::class))->uses);
+        $this->assertEquals($uses, $this->typeContextFactory->createFromReflection(new \ReflectionProperty(DummyWithUsesWindowsLineEndings::class, 'createdAt'))->uses);
+        $this->assertEquals($uses, $this->typeContextFactory->createFromReflection(new \ReflectionMethod(DummyWithUsesWindowsLineEndings::class, 'setCreatedAt'))->uses);
+        $this->assertEquals($uses, $this->typeContextFactory->createFromReflection(new \ReflectionParameter([DummyWithUsesWindowsLineEndings::class, 'setCreatedAt'], 'createdAt'))->uses);
+    }
+
     public function testCollectTemplates()
     {
         $this->assertEquals([], $this->typeContextFactory->createFromClassName(Dummy::class)->templates);
diff --git a/src/Symfony/Component/TypeInfo/TypeContext/TypeContextFactory.php b/src/Symfony/Component/TypeInfo/TypeContext/TypeContextFactory.php
@@ -116,7 +116,7 @@ private function collectUses(\ReflectionClass $reflection): array
             return [];
         }
 
-        if (false === $lines = @file($fileName)) {
+        if (false === $lines = @file($fileName, \FILE_IGNORE_NEW_LINES)) {
             throw new RuntimeException(\sprintf('Unable to read file "%s".', $fileName));
         }
 
@@ -126,7 +126,7 @@ private function collectUses(\ReflectionClass $reflection): array
         foreach ($lines as $line) {
             if (str_starts_with($line, 'use ')) {
                 $inUseSection = true;
-                $use = explode(' as ', substr($line, 4, -2), 2);
+                $use = explode(' as ', substr($line, 4, -1), 2);
 
                 $alias = 1 === \count($use) ? substr($use[0], false !== ($p = strrpos($use[0], '\\')) ? 1 + $p : 0) : $use[1];
                 $uses[$alias] = $use[0];

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ private function collectUses(\ReflectionClass $reflection): array`
`116`	`116`	`return [];`
`117`	`117`	`}`
`118`	`118`
`119`		`- if (false === $lines = @file($fileName)) {`
	`119`	`+ if (false === $lines = @file($fileName, \FILE_IGNORE_NEW_LINES)) {`
`120`	`120`	`throw new RuntimeException(\sprintf('Unable to read file "%s".', $fileName));`
`121`	`121`	`}`
`122`	`122`
`@@ -126,7 +126,7 @@ private function collectUses(\ReflectionClass $reflection): array`
`126`	`126`	`foreach ($lines as $line) {`
`127`	`127`	`if (str_starts_with($line, 'use ')) {`
`128`	`128`	`$inUseSection = true;`
`129`		`- $use = explode(' as ', substr($line, 4, -2), 2);`
	`129`	`+ $use = explode(' as ', substr($line, 4, -1), 2);`
`130`	`130`
`131`	`131`	`$alias = 1 === \count($use) ? substr($use[0], false !== ($p = strrpos($use[0], '\\')) ? 1 + $p : 0) : $use[1];`
`132`	`132`	`$uses[$alias] = $use[0];`