From 1d36e470bac56c5e44056ec2e5947f6c7daeab1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Radim=20Vaculi=CC=81k?= <radim.vaculik@gmail.com>
Date: Thu, 18 Jan 2024 10:22:08 +0100
Subject: [PATCH] Symfony 7 support, #128

---
 composer.json                                     | 12 ++++++------
 .../DependencyInjection/Configuration.php         |  2 +-
 src/Bridges/SymfonyConsole/ContinueCommand.php    |  2 +-
 src/Bridges/SymfonyConsole/CreateCommand.php      |  2 +-
 src/Bridges/SymfonyConsole/ResetCommand.php       |  2 +-
 .../matrix/symfony-bundle/symfony-7.0-php-8.2.sh  | 15 +++++++++++++++
 6 files changed, 25 insertions(+), 10 deletions(-)
 create mode 100644 tests/matrix/symfony-bundle/symfony-7.0-php-8.2.sh

diff --git a/composer.json b/composer.json
index 6969656..89e8b78 100644
--- a/composer.json
+++ b/composer.json
@@ -4,7 +4,7 @@
 	"type": "library",
 	"license": "BSD-3-Clause",
 	"require": {
-		"php": ">=5.4"
+		"php": ">=7.0"
 	},
 	"require-dev": {
 		"dibi/dibi": "~3.0 | ~4.0",
@@ -17,11 +17,11 @@
 		"nette/tester": "~1.7 | ~2.0",
 		"nette/utils": "~2.3",
 		"nextras/dbal": "~1.0 | ~2.0 | ~3.0 | ~4.0 | ~5.0@dev",
-		"symfony/config": "~2.6 | ~3.0 | ~4.0 | ~5.0 | ~6.0",
-		"symfony/console": "~2.6 | ~3.0 | ~4.0 | ~5.0 | ~6.0",
-		"symfony/dependency-injection": "~2.6 | ~3.0 | ~4.0 | ~5.0 | ~6.0",
-		"symfony/framework-bundle": "~2.6 | ~3.0 | ~4.0 | ~5.0 | ~6.0",
-		"symfony/http-kernel": "~2.6 | ~3.0 | ~4.0 | ~5.0 | ~6.0",
+		"symfony/config": "~2.6 | ~3.0 | ~4.0 | ~5.0 | ~6.0 | ~7.0",
+		"symfony/console": "~2.6 | ~3.0 | ~4.0 | ~5.0 | ~6.0 | ~7.0",
+		"symfony/dependency-injection": "~2.6 | ~3.0 | ~4.0 | ~5.0 | ~6.0 | ~7.0",
+		"symfony/framework-bundle": "~2.6 | ~3.0 | ~4.0 | ~5.0 | ~6.0 | ~7.0",
+		"symfony/http-kernel": "~2.6 | ~3.0 | ~4.0 | ~5.0 | ~6.0 | ~7.0",
 		"tracy/tracy": "^2.2",
 		"ext-openssl": "*"
 	},
diff --git a/src/Bridges/SymfonyBundle/DependencyInjection/Configuration.php b/src/Bridges/SymfonyBundle/DependencyInjection/Configuration.php
index 20120db..41dddef 100644
--- a/src/Bridges/SymfonyBundle/DependencyInjection/Configuration.php
+++ b/src/Bridges/SymfonyBundle/DependencyInjection/Configuration.php
@@ -15,7 +15,7 @@
 
 class Configuration implements ConfigurationInterface
 {
-	public function getConfigTreeBuilder()
+	public function getConfigTreeBuilder(): TreeBuilder
 	{
 		if (!method_exists(TreeBuilder::class, '__construct')) { // Symfony < 4.2.0
 			$treeBuilder = new TreeBuilder();
diff --git a/src/Bridges/SymfonyConsole/ContinueCommand.php b/src/Bridges/SymfonyConsole/ContinueCommand.php
index 659059a..9cbc455 100644
--- a/src/Bridges/SymfonyConsole/ContinueCommand.php
+++ b/src/Bridges/SymfonyConsole/ContinueCommand.php
@@ -30,7 +30,7 @@ protected function configure()
 	}
 
 
-	protected function execute(InputInterface $input, OutputInterface $output)
+	protected function execute(InputInterface $input, OutputInterface $output): int
 	{
 		return $this->runMigrations(Runner::MODE_CONTINUE, $this->config);
 	}
diff --git a/src/Bridges/SymfonyConsole/CreateCommand.php b/src/Bridges/SymfonyConsole/CreateCommand.php
index 53e7e19..04adf08 100644
--- a/src/Bridges/SymfonyConsole/CreateCommand.php
+++ b/src/Bridges/SymfonyConsole/CreateCommand.php
@@ -69,7 +69,7 @@ protected function configure()
 	 * @param  OutputInterface $output
 	 * @return int
 	 */
-	protected function execute(InputInterface $input, OutputInterface $output)
+	protected function execute(InputInterface $input, OutputInterface $output): int
 	{
 		$group = $this->getGroup($input->getArgument('type'));
 		$path = $this->getPath($group, $input->getArgument('label'));
diff --git a/src/Bridges/SymfonyConsole/ResetCommand.php b/src/Bridges/SymfonyConsole/ResetCommand.php
index ec79fce..8a9a618 100644
--- a/src/Bridges/SymfonyConsole/ResetCommand.php
+++ b/src/Bridges/SymfonyConsole/ResetCommand.php
@@ -30,7 +30,7 @@ protected function configure()
 	}
 
 
-	protected function execute(InputInterface $input, OutputInterface $output)
+	protected function execute(InputInterface $input, OutputInterface $output): int
 	{
 		return $this->runMigrations(Runner::MODE_RESET, $this->config);
 	}
diff --git a/tests/matrix/symfony-bundle/symfony-7.0-php-8.2.sh b/tests/matrix/symfony-bundle/symfony-7.0-php-8.2.sh
new file mode 100644
index 0000000..00e0cbe
--- /dev/null
+++ b/tests/matrix/symfony-bundle/symfony-7.0-php-8.2.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+PHP_VERSION_MIN="80200"
+PHP_VERSION_MAX="80299"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/dbal:~3.0"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/orm:~2.11"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/doctrine-bundle:~2.6"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/config:~7.0"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/console:~7.0"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/dependency-injection:~7.0"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/doctrine-bridge:~7.0"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/framework-bundle:~7.0"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/http-kernel:~7.0"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE symfony/yaml:~7.0"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/tester:~2.3"
+DBAL='doctrine'