Merge branch '6.4' into 7.1

xabbuh · xabbuh · commit 1500aee0094a · 2024-08-29T10:16:25.000+02:00
* 6.4:
  fix Twig 3.12 compatibility
  [Translation] Review Serbian translations
  Fix typos
  [DependencyInjection] Fix error message typo in YamlFileLoader
  Fix typo in exception message langage to language
diff --git a/Loader/AttributeFileLoader.php b/Loader/AttributeFileLoader.php
@@ -76,7 +76,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];
diff --git a/Tests/Loader/AttributeFileLoaderTest.php b/Tests/Loader/AttributeFileLoaderTest.php
@@ -54,7 +54,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');
     }
 

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ protected function findClass(string $file): string\|false`
`76`	`76`	`$tokens = token_get_all(file_get_contents($file));`
`77`	`77`
`78`	`78`	`if (1 === \count($tokens) && \T_INLINE_HTML === $tokens[0][0]) {`
`79`		`- 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));`
	`79`	`+ 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));`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`$nsTokens = [\T_NS_SEPARATOR => true, \T_STRING => true];`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public function testLoadTraitWithClassConstant()`
`54`	`54`	`public function testLoadFileWithoutStartTag()`
`55`	`55`	`{`
`56`	`56`	`$this->expectException(\InvalidArgumentException::class);`
`57`		`- $this->expectExceptionMessage('Did you forgot to add the "<?php" start tag at the beginning of the file?');`
	`57`	`+ $this->expectExceptionMessage('Did you forget to add the "<?php" start tag at the beginning of the file?');`
`58`	`58`	`$this->loader->load(__DIR__.'/../Fixtures/OtherAnnotatedClasses/NoStartTagClass.php');`
`59`	`59`	`}`
`60`	`60`