From c0fd81ae429344ae848c9c763b8d742a7da1044f Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 31 Jan 2020 13:48:55 +0100 Subject: [PATCH 1/6] bumped Symfony version to 4.4.5 --- Kernel.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Kernel.php b/Kernel.php index 828ba08406..d6c3976e4d 100644 --- a/Kernel.php +++ b/Kernel.php @@ -76,12 +76,12 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl private static $freshCache = []; - const VERSION = '4.4.4'; - const VERSION_ID = 40404; + const VERSION = '4.4.5-DEV'; + const VERSION_ID = 40405; const MAJOR_VERSION = 4; const MINOR_VERSION = 4; - const RELEASE_VERSION = 4; - const EXTRA_VERSION = ''; + const RELEASE_VERSION = 5; + const EXTRA_VERSION = 'DEV'; const END_OF_MAINTENANCE = '11/2022'; const END_OF_LIFE = '11/2023'; From de64b09dcafb81019f6b6dc01b42a02d877fe04a Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 4 Feb 2020 09:03:00 +0100 Subject: [PATCH 2/6] Fix CS --- Kernel.php | 6 +++--- Log/Logger.php | 2 +- Tests/Controller/ContainerControllerResolverTest.php | 2 +- Tests/DataCollector/RequestDataCollectorTest.php | 2 +- Tests/Log/LoggerTest.php | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Kernel.php b/Kernel.php index 87f102a0fb..82930d8c27 100644 --- a/Kernel.php +++ b/Kernel.php @@ -236,7 +236,7 @@ public function getBundle($name, $first = true/*, $noDeprecation = false */) } if (!isset($this->bundleMap[$name])) { - throw new \InvalidArgumentException(sprintf('Bundle "%s" does not exist or it is not enabled. Maybe you forgot to add it in the registerBundles() method of your %s.php file?', $name, \get_class($this))); + throw new \InvalidArgumentException(sprintf('Bundle "%s" does not exist or it is not enabled. Maybe you forgot to add it in the registerBundles() method of your %s.php file?', $name, static::class)); } if (true === $first) { @@ -583,7 +583,7 @@ protected function initializeContainer() $oldContainer = null; if ($fresh = $cache->isFresh()) { // Silence E_WARNING to ignore "include" failures - don't use "@" to prevent silencing fatal errors - $errorLevel = error_reporting(\E_ALL ^ \E_WARNING); + $errorLevel = error_reporting(E_ALL ^ E_WARNING); $fresh = $oldContainer = false; try { if (file_exists($cache->getPath()) && \is_object($this->container = include $cache->getPath())) { @@ -651,7 +651,7 @@ protected function initializeContainer() } if (null === $oldContainer && file_exists($cache->getPath())) { - $errorLevel = error_reporting(\E_ALL ^ \E_WARNING); + $errorLevel = error_reporting(E_ALL ^ E_WARNING); try { $oldContainer = include $cache->getPath(); } catch (\Throwable $e) { diff --git a/Log/Logger.php b/Log/Logger.php index 50cbcd428f..f490293a62 100644 --- a/Log/Logger.php +++ b/Log/Logger.php @@ -105,6 +105,6 @@ private function format($level, $message, array $context) $message = strtr($message, $replacements); } - return sprintf('%s [%s] %s', date(\DateTime::RFC3339), $level, $message).\PHP_EOL; + return sprintf('%s [%s] %s', date(\DateTime::RFC3339), $level, $message).PHP_EOL; } } diff --git a/Tests/Controller/ContainerControllerResolverTest.php b/Tests/Controller/ContainerControllerResolverTest.php index bdb2a00f4b..97d21e95a4 100644 --- a/Tests/Controller/ContainerControllerResolverTest.php +++ b/Tests/Controller/ContainerControllerResolverTest.php @@ -39,7 +39,7 @@ public function testGetControllerService() $controller = $resolver->getController($request); - $this->assertInstanceOf(\get_class($this), $controller[0]); + $this->assertInstanceOf(static::class, $controller[0]); $this->assertSame('controllerMethod1', $controller[1]); } diff --git a/Tests/DataCollector/RequestDataCollectorTest.php b/Tests/DataCollector/RequestDataCollectorTest.php index 9b6264be39..38979bba72 100644 --- a/Tests/DataCollector/RequestDataCollectorTest.php +++ b/Tests/DataCollector/RequestDataCollectorTest.php @@ -99,7 +99,7 @@ public function provideControllerCallables() '"Regular" callable', [$this, 'testControllerInspection'], [ - 'class' => RequestDataCollectorTest::class, + 'class' => self::class, 'method' => 'testControllerInspection', 'file' => __FILE__, 'line' => $r1->getStartLine(), diff --git a/Tests/Log/LoggerTest.php b/Tests/Log/LoggerTest.php index 7439ae1376..79039c1c97 100644 --- a/Tests/Log/LoggerTest.php +++ b/Tests/Log/LoggerTest.php @@ -186,7 +186,7 @@ public function testContextExceptionKeyCanBeExceptionOrOtherValues() public function testFormatter() { $this->logger = new Logger(LogLevel::DEBUG, $this->tmpFile, function ($level, $message, $context) { - return json_encode(['level' => $level, 'message' => $message, 'context' => $context]).\PHP_EOL; + return json_encode(['level' => $level, 'message' => $message, 'context' => $context]).PHP_EOL; }); $this->logger->error('An error', ['foo' => 'bar']); From 29ec9509e0b6d01d9685800eaff9df925c891906 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 4 Feb 2020 10:29:10 +0100 Subject: [PATCH 3/6] Fix CS --- Kernel.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Kernel.php b/Kernel.php index d6c3976e4d..b124ebe634 100644 --- a/Kernel.php +++ b/Kernel.php @@ -228,7 +228,7 @@ public function getBundles() public function getBundle($name) { if (!isset($this->bundles[$name])) { - $class = \get_class($this); + $class = static::class; $class = 'c' === $class[0] && 0 === strpos($class, "class@anonymous\0") ? get_parent_class($class).'@anonymous' : $class; throw new \InvalidArgumentException(sprintf('Bundle "%s" does not exist or it is not enabled. Maybe you forgot to add it in the registerBundles() method of your %s.php file?', $name, $class)); @@ -473,7 +473,7 @@ protected function build(ContainerBuilder $container) */ protected function getContainerClass() { - $class = \get_class($this); + $class = static::class; $class = 'c' === $class[0] && 0 === strpos($class, "class@anonymous\0") ? get_parent_class($class).str_replace('.', '_', ContainerBuilder::hash($class)) : $class; $class = $this->name.str_replace('\\', '_', $class).ucfirst($this->environment).($this->debug ? 'Debug' : '').'Container'; @@ -510,7 +510,7 @@ protected function initializeContainer() $cachePath = $cache->getPath(); // Silence E_WARNING to ignore "include" failures - don't use "@" to prevent silencing fatal errors - $errorLevel = error_reporting(\E_ALL ^ \E_WARNING); + $errorLevel = error_reporting(E_ALL ^ E_WARNING); try { if (file_exists($cachePath) && \is_object($this->container = include $cachePath) From 0bb63672cb24bbbb76b46d3ffecd396fdf44f918 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Fri, 14 Feb 2020 11:01:23 +0100 Subject: [PATCH 4/6] [HttpKernel] fix registering DebugHandlersListener regardless of the PHP_SAPI --- EventListener/DebugHandlersListener.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/EventListener/DebugHandlersListener.php b/EventListener/DebugHandlersListener.php index df9df09c0b..957a3cdb0f 100644 --- a/EventListener/DebugHandlersListener.php +++ b/EventListener/DebugHandlersListener.php @@ -65,6 +65,9 @@ public function __construct(callable $exceptionHandler = null, LoggerInterface $ */ public function configure(Event $event = null) { + if ($event instanceof ConsoleEvent && !\in_array(\PHP_SAPI, ['cli', 'phpdbg'], true)) { + return; + } if (!$event instanceof KernelEvent ? !$this->firstCall : !$event->isMasterRequest()) { return; } @@ -148,7 +151,7 @@ public static function getSubscribedEvents() { $events = [KernelEvents::REQUEST => ['configure', 2048]]; - if ('cli' === \PHP_SAPI && \defined('Symfony\Component\Console\ConsoleEvents::COMMAND')) { + if (\defined('Symfony\Component\Console\ConsoleEvents::COMMAND')) { $events[ConsoleEvents::COMMAND] = ['configure', 2048]; } From 162863821be88d908d51db9b76162ac6613c8b32 Mon Sep 17 00:00:00 2001 From: Daniel Gorgan Date: Fri, 14 Feb 2020 17:15:50 +0200 Subject: [PATCH 5/6] Set previous exception when rethrown from controller resolver --- Controller/ControllerResolver.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Controller/ControllerResolver.php b/Controller/ControllerResolver.php index c981642fee..619628b5c7 100644 --- a/Controller/ControllerResolver.php +++ b/Controller/ControllerResolver.php @@ -88,7 +88,7 @@ public function getController(Request $request) try { $callable = $this->createController($controller); } catch (\InvalidArgumentException $e) { - throw new \InvalidArgumentException(sprintf('The controller for URI "%s" is not callable. %s', $request->getPathInfo(), $e->getMessage())); + throw new \InvalidArgumentException(sprintf('The controller for URI "%s" is not callable. %s', $request->getPathInfo(), $e->getMessage()), 0, $e); } return $callable; From 8c8734486dada83a6041ab744709bdc1651a8462 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 29 Feb 2020 11:31:38 +0100 Subject: [PATCH 6/6] updated VERSION for 4.4.5 --- Kernel.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Kernel.php b/Kernel.php index b124ebe634..0b21ee8996 100644 --- a/Kernel.php +++ b/Kernel.php @@ -76,12 +76,12 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl private static $freshCache = []; - const VERSION = '4.4.5-DEV'; + const VERSION = '4.4.5'; const VERSION_ID = 40405; const MAJOR_VERSION = 4; const MINOR_VERSION = 4; const RELEASE_VERSION = 5; - const EXTRA_VERSION = 'DEV'; + const EXTRA_VERSION = ''; const END_OF_MAINTENANCE = '11/2022'; const END_OF_LIFE = '11/2023';