Skip to content

Commit 8ee0c24

Browse files
committed
Merge branch '5.4' into 6.4
* 5.4: fix Twig 3.12 compatibility [Translation] Review Serbian translations Fix typos [DependencyInjection] Fix error message typo in YamlFileLoader
2 parents aad19fe + b6f7178 commit 8ee0c24

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Loader/AttributeFileLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ protected function findClass(string $file): string|false
8282
$tokens = token_get_all(file_get_contents($file));
8383

8484
if (1 === \count($tokens) && \T_INLINE_HTML === $tokens[0][0]) {
85-
throw new \InvalidArgumentException(sprintf('The file "%s" does not contain PHP code. Did you forgot to add the "<?php" start tag at the beginning of the file?', $file));
85+
throw new \InvalidArgumentException(sprintf('The file "%s" does not contain PHP code. Did you forget to add the "<?php" start tag at the beginning of the file?', $file));
8686
}
8787

8888
$nsTokens = [\T_NS_SEPARATOR => true, \T_STRING => true];

Tests/Loader/AttributeFileLoaderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public function testLoadTraitWithClassConstant()
5858
public function testLoadFileWithoutStartTag()
5959
{
6060
$this->expectException(\InvalidArgumentException::class);
61-
$this->expectExceptionMessage('Did you forgot to add the "<?php" start tag at the beginning of the file?');
61+
$this->expectExceptionMessage('Did you forget to add the "<?php" start tag at the beginning of the file?');
6262
$this->loader->load(__DIR__.'/../Fixtures/OtherAnnotatedClasses/NoStartTagClass.php');
6363
}
6464

0 commit comments

Comments
 (0)