Skip to content

Commit 61c1bdc

Browse files
Merge branch '4.3' into 4.4
* 4.3: Fix travis script minor fix for wrong case [HttpFoundation] Fix `getMaxFilesize` [Cache] fix warning on PHP 7.4 [Console] fix warning on PHP 7.4 Don't add value of (default/static) objects to the signature fix(yml): fix comment in milti line value Make sure trace_level is always defined Fix bindings and tagged_locator Recompile container when translations directory changes
2 parents bc86425 + e7119fe commit 61c1bdc

File tree

2 files changed

+5
-18
lines changed

2 files changed

+5
-18
lines changed

DependencyInjection/FrameworkExtension.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1143,12 +1143,12 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
11431143
$defaultDir = $container->getParameterBag()->resolveValue($config['default_path']);
11441144
$rootDir = $container->getParameter('kernel.root_dir');
11451145
foreach ($container->getParameter('kernel.bundles_metadata') as $name => $bundle) {
1146-
if (is_dir($dir = $bundle['path'].'/Resources/translations')) {
1146+
if ($container->fileExists($dir = $bundle['path'].'/Resources/translations')) {
11471147
$dirs[] = $dir;
11481148
} else {
11491149
$nonExistingDirs[] = $dir;
11501150
}
1151-
if (is_dir($dir = $rootDir.sprintf('/Resources/%s/translations', $name))) {
1151+
if ($container->fileExists($dir = $rootDir.sprintf('/Resources/%s/translations', $name))) {
11521152
@trigger_error(sprintf('Translations directory "%s" is deprecated since Symfony 4.2, use "%s" instead.', $dir, $defaultDir), E_USER_DEPRECATED);
11531153
$dirs[] = $dir;
11541154
} else {
@@ -1157,7 +1157,7 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
11571157
}
11581158

11591159
foreach ($config['paths'] as $dir) {
1160-
if (is_dir($dir)) {
1160+
if ($container->fileExists($dir)) {
11611161
$dirs[] = $transPaths[] = $dir;
11621162
} else {
11631163
throw new \UnexpectedValueException(sprintf('%s defined in translator.paths does not exist or is not a directory', $dir));
@@ -1172,13 +1172,13 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
11721172
$container->getDefinition('console.command.translation_update')->replaceArgument(6, $transPaths);
11731173
}
11741174

1175-
if (is_dir($defaultDir)) {
1175+
if ($container->fileExists($defaultDir)) {
11761176
$dirs[] = $defaultDir;
11771177
} else {
11781178
$nonExistingDirs[] = $defaultDir;
11791179
}
11801180

1181-
if (is_dir($dir = $rootDir.'/Resources/translations')) {
1181+
if ($container->fileExists($dir = $rootDir.'/Resources/translations')) {
11821182
if ($dir !== $defaultDir) {
11831183
@trigger_error(sprintf('Translations directory "%s" is deprecated since Symfony 4.2, use "%s" instead.', $dir, $defaultDir), E_USER_DEPRECATED);
11841184
}

Tests/DependencyInjection/FrameworkExtensionTest.php

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
use Symfony\Component\Cache\Adapter\ProxyAdapter;
2727
use Symfony\Component\Cache\Adapter\RedisAdapter;
2828
use Symfony\Component\Cache\DependencyInjection\CachePoolPass;
29-
use Symfony\Component\Config\Resource\DirectoryResource;
30-
use Symfony\Component\Config\Resource\FileExistenceResource;
3129
use Symfony\Component\DependencyInjection\ChildDefinition;
3230
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
3331
use Symfony\Component\DependencyInjection\Compiler\ResolveInstanceofConditionalsPass;
@@ -847,17 +845,6 @@ function ($directory) {
847845
);
848846

849847
$this->assertNotEmpty($nonExistingDirectories, 'FrameworkBundle should pass non existing directories to Translator');
850-
851-
$resources = $container->getResources();
852-
foreach ($resources as $resource) {
853-
if ($resource instanceof DirectoryResource) {
854-
$this->assertNotContains('translations', $resource->getResource());
855-
}
856-
857-
if ($resource instanceof FileExistenceResource) {
858-
$this->assertNotContains('translations', $resource->getResource());
859-
}
860-
}
861848
}
862849

863850
/**

0 commit comments

Comments
 (0)