Skip to content

Commit

Permalink
Merge branch '5.2' into 5.3
Browse files Browse the repository at this point in the history
* 5.2:
  CS fix
  Missing translations from traits
  Fix SkippedTestSuite
  [Console] Fix type annotation on InputInterface::hasArgument()
  Revert "minor #41949 [Console] fix type annotations on InputInterface (nicolas-grekas)"
  [EventDispatcher] Correct the called event listener method case
  Add missing translations for Japanese.
  Revert "bug #41952 [Console] fix handling positional arguments (nicolas-grekas)"
  fix backport
  • Loading branch information
nicolas-grekas committed Jul 4, 2021
2 parents e11d12c + cafaee0 commit fe27e36
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions DependencyInjection/TranslatorPathsPass.php
Expand Up @@ -64,6 +64,9 @@ public function process(ContainerBuilder $container)
foreach ($this->paths as $class => $_) {
if (($r = $container->getReflectionClass($class)) && !$r->isInterface()) {
$paths[] = $r->getFileName();
foreach ($r->getTraits() as $trait) {
$paths[] = $trait->getFileName();
}
}
}
if ($paths) {
Expand Down

0 comments on commit fe27e36

Please sign in to comment.