Merge branch '5.4' into 6.4

xabbuh · xabbuh · commit e93c8368dc99 · 2024-08-29T10:15:38.000+02:00
* 5.4:
  fix Twig 3.12 compatibility
  [Translation] Review Serbian translations
  Fix typos
  [DependencyInjection] Fix error message typo in YamlFileLoader
diff --git a/Loader/YamlFileLoader.php b/Loader/YamlFileLoader.php
@@ -557,7 +557,7 @@ private function parseDefinition(string $id, array|string|null $service, string
                 }
 
                 if (\is_string($k)) {
-                    throw new InvalidArgumentException(sprintf('Invalid method call for service "%s", did you forgot a leading dash before "%s: ..." in "%s"?', $id, $k, $file));
+                    throw new InvalidArgumentException(sprintf('Invalid method call for service "%s", did you forget a leading dash before "%s: ..." in "%s"?', $id, $k, $file));
                 }
 
                 if (isset($call['method']) && \is_string($call['method'])) {

Original file line number	Diff line number	Diff line change
`@@ -557,7 +557,7 @@ private function parseDefinition(string $id, array\|string\|null $service, string`
`557`	`557`	`}`
`558`	`558`
`559`	`559`	`if (\is_string($k)) {`
`560`		`- throw new InvalidArgumentException(sprintf('Invalid method call for service "%s", did you forgot a leading dash before "%s: ..." in "%s"?', $id, $k, $file));`
	`560`	`+ throw new InvalidArgumentException(sprintf('Invalid method call for service "%s", did you forget a leading dash before "%s: ..." in "%s"?', $id, $k, $file));`
`561`	`561`	`}`
`562`	`562`
`563`	`563`	`if (isset($call['method']) && \is_string($call['method'])) {`