From b588bd04de5d5ef2770e66cf80cae0b65d4f788e Mon Sep 17 00:00:00 2001 From: David Joos Date: Thu, 28 Apr 2022 17:14:28 +0100 Subject: [PATCH 1/3] allow PHP 8 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 44cfa2e..24de961 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ }, "require" : { - "php": "^5.6|^7.0", + "php": "^5.6|^7.0|^8.0", "bernard/bernard": "1.0.0-alpha9", "symfony/framework-bundle": "^2.8|^3.2|^4.0|^5.0" }, From a4ae5177063a1aa164632ed5525ec1116f6c39bc Mon Sep 17 00:00:00 2001 From: David Joos Date: Fri, 29 Apr 2022 10:42:26 +0100 Subject: [PATCH 2/3] Symfony 5 tweak(s) --- Collector/ProducerCollector.php | 2 +- Command/DebugCommand.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Collector/ProducerCollector.php b/Collector/ProducerCollector.php index 3c05275..509f7bb 100644 --- a/Collector/ProducerCollector.php +++ b/Collector/ProducerCollector.php @@ -26,7 +26,7 @@ public function __construct() * @param Response $response A Response instance * @param \Exception $exception An Exception instance */ - public function collect(Request $request, Response $response, \Exception $exception = null) + public function collect(Request $request, Response $response, \Throwable $exception = null) { // We don't collect anything from the request data } diff --git a/Command/DebugCommand.php b/Command/DebugCommand.php index 581b7bb..c549679 100644 --- a/Command/DebugCommand.php +++ b/Command/DebugCommand.php @@ -3,7 +3,7 @@ namespace Bernard\BernardBundle\Command; use Bernard\Router; -use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand; +use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Helper\Table; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; @@ -11,7 +11,7 @@ /** * @final since 2.1 */ -class DebugCommand extends ContainerAwareCommand +class DebugCommand extends Command { /** * @var Router From 362a97285af9314ef1baec76890dc89620dc4b08 Mon Sep 17 00:00:00 2001 From: David Joos Date: Fri, 23 May 2025 16:04:05 +0100 Subject: [PATCH 3/3] allow use of Symfony 6 framework-bundle --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 24de961..dd821db 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ "require" : { "php": "^5.6|^7.0|^8.0", "bernard/bernard": "1.0.0-alpha9", - "symfony/framework-bundle": "^2.8|^3.2|^4.0|^5.0" + "symfony/framework-bundle": "^2.8|^3.2|^4.0|^5.0|^6.0" }, "require-dev" : {