From 5af6edae62dbbd5885c62059c2b864e54e97af47 Mon Sep 17 00:00:00 2001 From: "Alexander M. Turek" Date: Sun, 6 Jun 2021 14:37:28 +0200 Subject: [PATCH] [FrameworkBundle][WebProfilerBundle] Don't pass null to string parameters Signed-off-by: Alexander M. Turek --- .../FrameworkBundle/Console/Descriptor/XmlDescriptor.php | 4 ++-- .../FrameworkBundle/Tests/Kernel/ConcreteMicroKernel.php | 6 ++++-- .../EventListener/WebDebugToolbarListener.php | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php index b11674a31b..e0ea8233f1 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php +++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/XmlDescriptor.php @@ -285,7 +285,7 @@ class XmlDescriptor extends Descriptor $descriptionXML->appendChild($dom->createCDATASection($classDescription)); } - $serviceXML->setAttribute('class', $definition->getClass()); + $serviceXML->setAttribute('class', $definition->getClass() ?? ''); if ($factory = $definition->getFactory()) { $serviceXML->appendChild($factoryXML = $dom->createElement('factory')); @@ -311,7 +311,7 @@ class XmlDescriptor extends Descriptor $serviceXML->setAttribute('abstract', $definition->isAbstract() ? 'true' : 'false'); $serviceXML->setAttribute('autowired', $definition->isAutowired() ? 'true' : 'false'); $serviceXML->setAttribute('autoconfigured', $definition->isAutoconfigured() ? 'true' : 'false'); - $serviceXML->setAttribute('file', $definition->getFile()); + $serviceXML->setAttribute('file', $definition->getFile() ?? ''); $calls = $definition->getMethodCalls(); if (\count($calls) > 0) { diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Kernel/ConcreteMicroKernel.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Kernel/ConcreteMicroKernel.php index b2a84ed536..6eb02fa11a 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Kernel/ConcreteMicroKernel.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Kernel/ConcreteMicroKernel.php @@ -76,8 +76,10 @@ class ConcreteMicroKernel extends Kernel implements EventSubscriberInterface public function __destruct() { - $fs = new Filesystem(); - $fs->remove($this->cacheDir); + if ($this->cacheDir) { + $fs = new Filesystem(); + $fs->remove($this->cacheDir); + } } protected function configureRoutes(RouteCollectionBuilder $routes) diff --git a/src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php b/src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php index 7f41db3052..a681f5d242 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php +++ b/src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php @@ -103,7 +103,7 @@ class WebDebugToolbarListener implements EventSubscriberInterface || $response->isRedirection() || ($response->headers->has('Content-Type') && false === strpos($response->headers->get('Content-Type'), 'html')) || 'html' !== $request->getRequestFormat() - || false !== stripos($response->headers->get('Content-Disposition'), 'attachment;') + || false !== stripos($response->headers->get('Content-Disposition', ''), 'attachment;') ) { return; }