Skip to content

Commit

Permalink
Merge branch '5.4' into 6.4
Browse files Browse the repository at this point in the history
* 5.4:
  fix Twig 3.12 compatibility
  [Translation] Review Serbian translations
  Fix typos
  [DependencyInjection] Fix error message typo in YamlFileLoader
  • Loading branch information
xabbuh committed Aug 29, 2024
2 parents aad19fe + b6f7178 commit 8ee0c24
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Loader/AttributeFileLoader.php
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ protected function findClass(string $file): string|false
$tokens = token_get_all(file_get_contents($file));

if (1 === \count($tokens) && \T_INLINE_HTML === $tokens[0][0]) {
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));
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));
}

$nsTokens = [\T_NS_SEPARATOR => true, \T_STRING => true];
Expand Down
2 changes: 1 addition & 1 deletion Tests/Loader/AttributeFileLoaderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public function testLoadTraitWithClassConstant()
public function testLoadFileWithoutStartTag()
{
$this->expectException(\InvalidArgumentException::class);
$this->expectExceptionMessage('Did you forgot to add the "<?php" start tag at the beginning of the file?');
$this->expectExceptionMessage('Did you forget to add the "<?php" start tag at the beginning of the file?');
$this->loader->load(__DIR__.'/../Fixtures/OtherAnnotatedClasses/NoStartTagClass.php');
}

Expand Down

0 comments on commit 8ee0c24

Please sign in to comment.