Skip to content

Commit 8ff81c7

Browse files
committed
Merge branch '4.3' into 4.4
* 4.3: fixed CS fixed CS fixed CS Do not log or call the proxy function when the locale is the same Added missing required dependencies on psr/cache and psr/container in symfony/cache-contracts and symfony/service-contracts respectively. [HttpClient] fix closing debug stream prematurely [Mailer] made code more robust Restore compatibility with php 5.5 fixed sender/recipients in SMTP Envelope collect called listeners information only once [HttpKernel] Remove TestEventDispatcher.
2 parents 2666a68 + a782f6c commit 8ff81c7

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

CacheWarmer/AnnotationsCacheWarmer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public function __construct(Reader $annotationReader, string $phpArrayFile, $exc
4040
if ($excludeRegexp instanceof CacheItemPoolInterface) {
4141
@trigger_error(sprintf('The CacheItemPoolInterface $fallbackPool argument of "%s()" is deprecated since Symfony 4.2, you should not pass it anymore.', __METHOD__), E_USER_DEPRECATED);
4242
$excludeRegexp = $debug;
43-
$debug = 4 < \func_num_args() && \func_get_arg(4);
43+
$debug = 4 < \func_num_args() && func_get_arg(4);
4444
}
4545
parent::__construct($phpArrayFile);
4646
$this->annotationReader = $annotationReader;

CacheWarmer/SerializerCacheWarmer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class SerializerCacheWarmer extends AbstractPhpFileCacheWarmer
3636
*/
3737
public function __construct(array $loaders, string $phpArrayFile)
3838
{
39-
if (2 < \func_num_args() && \func_get_arg(2) instanceof CacheItemPoolInterface) {
39+
if (2 < \func_num_args() && func_get_arg(2) instanceof CacheItemPoolInterface) {
4040
@trigger_error(sprintf('The CacheItemPoolInterface $fallbackPool argument of "%s()" is deprecated since Symfony 4.2, you should not pass it anymore.', __METHOD__), E_USER_DEPRECATED);
4141
}
4242
parent::__construct($phpArrayFile);

DependencyInjection/FrameworkExtension.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1115,12 +1115,12 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
11151115
$defaultDir = $container->getParameterBag()->resolveValue($config['default_path']);
11161116
$rootDir = $container->getParameter('kernel.root_dir');
11171117
foreach ($container->getParameter('kernel.bundles_metadata') as $name => $bundle) {
1118-
if (\is_dir($dir = $bundle['path'].'/Resources/translations')) {
1118+
if (is_dir($dir = $bundle['path'].'/Resources/translations')) {
11191119
$dirs[] = $dir;
11201120
} else {
11211121
$nonExistingDirs[] = $dir;
11221122
}
1123-
if (\is_dir($dir = $rootDir.sprintf('/Resources/%s/translations', $name))) {
1123+
if (is_dir($dir = $rootDir.sprintf('/Resources/%s/translations', $name))) {
11241124
@trigger_error(sprintf('Translations directory "%s" is deprecated since Symfony 4.2, use "%s" instead.', $dir, $defaultDir), E_USER_DEPRECATED);
11251125
$dirs[] = $dir;
11261126
} else {
@@ -1129,7 +1129,7 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
11291129
}
11301130

11311131
foreach ($config['paths'] as $dir) {
1132-
if (\is_dir($dir)) {
1132+
if (is_dir($dir)) {
11331133
$dirs[] = $transPaths[] = $dir;
11341134
} else {
11351135
throw new \UnexpectedValueException(sprintf('%s defined in translator.paths does not exist or is not a directory', $dir));
@@ -1144,13 +1144,13 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
11441144
$container->getDefinition('console.command.translation_update')->replaceArgument(6, $transPaths);
11451145
}
11461146

1147-
if (\is_dir($defaultDir)) {
1147+
if (is_dir($defaultDir)) {
11481148
$dirs[] = $defaultDir;
11491149
} else {
11501150
$nonExistingDirs[] = $defaultDir;
11511151
}
11521152

1153-
if (\is_dir($dir = $rootDir.'/Resources/translations')) {
1153+
if (is_dir($dir = $rootDir.'/Resources/translations')) {
11541154
if ($dir !== $defaultDir) {
11551155
@trigger_error(sprintf('Translations directory "%s" is deprecated since Symfony 4.2, use "%s" instead.', $dir, $defaultDir), E_USER_DEPRECATED);
11561156
}
@@ -1187,7 +1187,7 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
11871187
$translator->getArgument(4),
11881188
[
11891189
'resource_files' => $files,
1190-
'scanned_directories' => \array_merge($dirs, $nonExistingDirs),
1190+
'scanned_directories' => array_merge($dirs, $nonExistingDirs),
11911191
]
11921192
);
11931193

Test/WebTestAssertionsTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ private static function getClient(KernelBrowser $newClient = null): ?KernelBrows
195195
}
196196

197197
if (!$client instanceof KernelBrowser) {
198-
static::fail(\sprintf('A client must be set to make assertions on it. Did you forget to call "%s::createClient()"?', __CLASS__));
198+
static::fail(sprintf('A client must be set to make assertions on it. Did you forget to call "%s::createClient()"?', __CLASS__));
199199
}
200200

201201
return $client;

0 commit comments

Comments
 (0)