8000 Merge branch '3.4' into 4.0 · symfony/symfony@ca48f4c · GitHub
[go: up one dir, main page]
Skip to content

Commit ca48f4c

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '3.4' into 4.0
* 3.4: revert #27545 Update Finder.php [FrameworkBundle] remove dead code in CachePoolClearerPass Fix security-core cross-dependencies, fixes #27507 Pass previous exception to FatalErrorException
2 parents 9786ec8 + 9586c43 commit ca48f4c

File tree

5 files changed

+11
-20
lines changed

5 files changed

+11
-20
lines changed

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CachePoolClearerPass.php

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
namespace Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler;
1313

14-
use Symfony\Component\Cache\Adapter\AbstractAdapter;
1514
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
1615
use Symfony\Component\DependencyInjection\ContainerBuilder;
1716
use Symfony\Component\DependencyInjection\Reference;
@@ -38,22 +37,5 @@ public function process(ContainerBuilder $container)
3837
}
3938
$clearer->replaceArgument(0, $pools);
4039
}
41-
42-
if (!$container->has('cache.annotations')) {
43-
return;
44-
}
45-
$factory = array(AbstractAdapter::class, 'createSystemCache');
46-
$annotationsPool = $ 10000 container->findDefinition('cache.annotations');
47-
if ($factory !== $annotationsPool->getFactory() || 4 !== count($annotationsPool->getArguments())) {
48-
return;
49-
}
50-
if ($container->has('monolog.logger.cache')) {
51-
$annotationsPool->addArgument(new Reference('monolog.logger.cache'));
52-
} elseif ($container->has('cache.system')) {
53-
$systemPool = $container->findDefinition('cache.system');
54-
if ($factory === $systemPool->getFactory() && 5 <= count($systemArgs = $systemPool->getArguments())) {
55-
$annotationsPool->addArgument($systemArgs[4]);
56-
}
57-
}
5840
}
5941
}

‎src/Symfony/Component/Debug/Exception/ClassNotFoundException.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ public function __construct(string $message, \ErrorException $previous)
2626
$previous->getSeverity(),
2727
$previous->getFile(),
2828
$previous->getLine(),
29+
null,
30+
true,
31+
null,
2932
$previous->getPrevious()
3033
);
3134
$this->setTrace($previous->getTrace());

‎src/Symfony/Component/Debug/Exception/FatalErrorException.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
*/
1919
class FatalErrorException extends \ErrorException
2020
{
21-
public function __construct(string $message, int $code, int $severity, string $filename, int $lineno, int $traceOffset = null, bool $traceArgs = true, array $trace = null)
21+
public function __construct(string $message, int $code, int $severity, string $filename, int $lineno, int $traceOffset = null, bool $traceArgs = true, array $trace = null, \Throwable $previous = null)
2222
{
23-
parent::__construct($message, $code, $severity, $filename, $lineno);
23+
parent::__construct($message, $code, $severity, $filename, $lineno, $previous);
2424

2525
if (null !== $trace) {
2626
if (!$traceArgs) {

‎src/Symfony/Component/Debug/Exception/UndefinedFunctionException.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ public function __construct(string $message, \ErrorException $previous)
2626
$previous->getSeverity(),
2727
$previous->getFile(),
2828
$previous->getLine(),
29+
null,
30+
true,
31+
null,
2932
$previous->getPrevious()
3033
);
3134
$this->setTrace($previous->getTrace());

‎src/Symfony/Component/Debug/Exception/UndefinedMethodException.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ public function __construct(string $message, \ErrorException $previous)
2626
$previous->getSeverity(),
2727
$previous->getFile(),
2828
$previous->getLine(),
29+
null,
30+
true,
31+
null,
2932
$previous->getPrevious()
3033
);
3134
$this->setTrace($previous->getTrace());

0 commit comments

Comments
 (0)
0