NotificationsYou must be signed in to change notification settings
Fork9.7k
Star30.8k

Commitbccbe64

committed

Use is_dir instead of file_exists to check if translation directories exist

This makes sure there actual directories by that name, not just fileswith the name we'd expect to be a directory

1 parentc4b40e3 commitbccbe64Copy full SHA for bccbe64

File tree

1 file changed

-5

lines changed

src/Symfony/Bundle/FrameworkBundle/DependencyInjection
- FrameworkExtension.php

1 file changed

-5

lines changed

`‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php‎`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1094,12 +1094,12 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder`
`1094`	`1094`	`$defaultDir =$container->getParameterBag()->resolveValue($config['default_path']);`
`1095`	`1095`	`$rootDir =$container->getParameter('kernel.root_dir');`
`1096`	`1096`	`foreach ($container->getParameter('kernel.bundles_metadata')as$name =>$bundle) {`
`1097`		`-if (\file_exists($dir =$bundle['path'].'/Resources/translations')) {`
	`1097`	`+if (\is_dir($dir =$bundle['path'].'/Resources/translations')) {`
`1098`	`1098`	`$dirs[] =$dir;`
`1099`	`1099`	`}else {`
`1100`	`1100`	`$nonExistingDirs[] =$dir;`
`1101`	`1101`	`}`
`1102`		`-if (\file_exists($dir =$rootDir.sprintf('/Resources/%s/translations',$name))) {`
	`1102`	`+if (\is_dir($dir =$rootDir.sprintf('/Resources/%s/translations',$name))) {`
`1103`	`1103`	`@trigger_error(sprintf('Translations directory "%s" is deprecated since Symfony 4.2, use "%s" instead.',$dir,$defaultDir),E_USER_DEPRECATED);`
`1104`	`1104`	`$dirs[] =$dir;`
`1105`	`1105`	`}else {`
`@@ -1108,7 +1108,7 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder`
`1108`	`1108`	`}`
`1109`	`1109`
`1110`	`1110`	`foreach ($config['paths']as$dir) {`
`1111`		`-if (\file_exists($dir)) {`
	`1111`	`+if (\is_dir($dir)) {`
`1112`	`1112`	`$dirs[] =$transPaths[] =$dir;`
`1113`	`1113`	`}else {`
`1114`	`1114`	`thrownew \UnexpectedValueException(sprintf('%s defined in translator.paths does not exist or is not a directory',$dir));`
`@@ -1123,13 +1123,13 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder`
`1123`	`1123`	`$container->getDefinition('console.command.translation_update')->replaceArgument(6,$transPaths);`
`1124`	`1124`	`}`
`1125`	`1125`
`1126`		`-if (\file_exists($defaultDir)) {`
	`1126`	`+if (\is_dir($defaultDir)) {`
`1127`	`1127`	`$dirs[] =$defaultDir;`
`1128`	`1128`	`}else {`
`1129`	`1129`	`$nonExistingDirs[] =$defaultDir;`
`1130`	`1130`	`}`
`1131`	`1131`
`1132`		`-if (\file_exists($dir =$rootDir.'/Resources/translations')) {`
	`1132`	`+if (\is_dir($dir =$rootDir.'/Resources/translations')) {`
`1133`	`1133`	`if ($dir !==$defaultDir) {`
`1134`	`1134`	`@trigger_error(sprintf('Translations directory "%s" is deprecated since Symfony 4.2, use "%s" instead.',$dir,$defaultDir),E_USER_DEPRECATED);`
`1135`	`1135`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commitbccbe64

File tree

1 file changed

1 file changed

`‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php‎`

0 commit comments