[TypeInfo] use an EOL-agnostic approach to parse class uses #60909
Conversation
xabbuh
commented
Jun 26, 2025
| Q | A |
|---|---|
| Branch? | 7.2 |
| Bug fix? | yes |
| New feature? | no |
| Deprecations? | no |
| Issues | Fix #60906 |
| License | MIT |
This comment was marked as outdated.
This comment was marked as outdated.
| @@ -82,6 +83,22 @@ public function testCollectUses() | |||
| $this->assertEquals($uses, $this->typeContextFactory->createFromReflection(new \ReflectionParameter([DummyWithUses::class, 'setCreatedAt'], 'createdAt'))->uses); | |||
| } | |||
|
|
|||
| public function testCollectUsesWindowsLineEndings() | |||
| { | |||
There was a problem hiding this comment.
I suggest adding an assertion that the DummyWithUsesWindowsLineEndings.php file contains \r\n, to avoid having someone changing the line endings (by mistake or intentionally) and making this test useless.
This could happen for instance for contributors on Windows using git's newline conversion features (maybe we could even avoid that specific case with a .gitattributes telling git we want Windows line endings in this specific file)
There was a problem hiding this comment.
I added both the assertion inside the test as well as entries to the relevant .gitattributes files
e803276 to
76ad82b
Compare
.gitattributes
Outdated
| @@ -7,5 +7,6 @@ | |||
| /src/Symfony/Component/Translation/Bridge export-ignore | |||
| /src/Symfony/Component/Emoji/Resources/data/* linguist-generated=true | |||
| /src/Symfony/Component/Intl/Resources/data/*/* linguist-generated=true | |||
| /src/Symfony/Component/TypeInfo/Tests/Fixtures/DummyWithUsesWindowsLineEndings.php text eol=crlf | |||
There was a problem hiding this comment.
I don't think we need this if src/Symfony/Component/TypeInfo/.gitattributes already defines it
There was a problem hiding this comment.
Are you sure that src/Symfony/Component/TypeInfo/.gitattributes is evaluated when the mono-repo is checked out?
There was a problem hiding this comment.
yes. git respects all .gitattributes files, not just the file at the root of the repo (same for .gitignore files)
There was a problem hiding this comment.
alright 👍 I reverted this change