diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '4.4'

Browse Source 
* 4.4:
  [VarDumper] fix infinite recursion
  Fix web debug toolbar z-index property
  Avoid nested exceptions if errors occur when generating file links
This commit is contained in:
Fabien Potencier 2019-10-26 21:52:39 +02:00
commit 6525b5e490
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php
View File

@ -13,7 +13,6 @@ namespace Symfony\Component\HttpKernel\Debug;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\RequestStack; use Symfony\Component\HttpFoundation\RequestStack;
use Symfony\Component\Routing\Exception\ExceptionInterface;
use Symfony\Component\Routing\Generator\UrlGeneratorInterface; use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
/** /**
@ -80,7 +79,7 @@ class FileLinkFormatter
{ {
try { try {
return $router->generate($routeName).$queryString; return $router->generate($routeName).$queryString;
} catch (ExceptionInterface $e) { } catch (\Throwable $e) {
return null; return null;
} }
} }

2
src/Symfony/Component/HttpKernel/Resources/welcome.html.php
View File

@ -43,7 +43,7 @@
@media (min-width: 768px) { @media (min-width: 768px) {
@-webkit-keyframes fade-in { 0% { opacity: 0; } 100% { opacity: 1; } } @-webkit-keyframes fade-in { 0% { opacity: 0; } 100% { opacity: 1; } }
@keyframes fade-in { 0% { opacity: 0; } 100% { opacity: 1; } } @keyframes fade-in { 0% { opacity: 0; } 100% { opacity: 1; } }
.sf-toolbar { opacity: 0; -webkit-animation: fade-in 1s .2s forwards; animation: fade-in 1s .2s forwards;} .sf-toolbar { opacity: 0; -webkit-animation: fade-in 1s .2s forwards; animation: fade-in 1s .2s forwards; z-index: 99999; }
body { font-size: 20px; } body { font-size: 20px; }
.warning { text-align: center; } .warning { text-align: center; }

2
src/Symfony/Component/VarDumper/Caster/ClassStub.php
View File

@ -62,7 +62,7 @@ class ClassStub extends ConstStub
} }
if (null !== $callable && $r instanceof \ReflectionFunctionAbstract) { if (null !== $callable && $r instanceof \ReflectionFunctionAbstract) {
$s = ReflectionCaster::castFunctionAbstract($r, [], new Stub(), true); $s = ReflectionCaster::castFunctionAbstract($r, [], new Stub(), true, Caster::EXCLUDE_VERBOSE);
$s = ReflectionCaster::getSignature($s); $s = ReflectionCaster::getSignature($s);
if ('()' === substr($identifier, -2)) { if ('()' === substr($identifier, -2)) {

2
src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php
View File

@ -212,7 +212,7 @@ class ReflectionCaster
$a[$prefix.'parameters'] = new EnumStub($a[$prefix.'parameters']); $a[$prefix.'parameters'] = new EnumStub($a[$prefix.'parameters']);
} }
if ($v = $c->getStaticVariables()) { if (!($filter & Caster::EXCLUDE_VERBOSE) && $v = $c->getStaticVariables()) {
foreach ($v as $k => &$v) { foreach ($v as $k => &$v) {
if (\is_object($v)) { if (\is_object($v)) {
$a[$prefix.'use']['$'.$k] = new CutStub($v); $a[$prefix.'use']['$'.$k] = new CutStub($v);