Merge pull request #29 from kennaar/main

Allow Symfony ^7.0 as dependency
Nimut · Aug 5, 2024 · 01a92d4 · 01a92d4
2 parents e9db2b4 + 790ea36
commit 01a92d4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 /.idea
 /.Log
 composer.lock
+.phpunit.result.cache
diff --git a/composer.json b/composer.json
@@ -31,12 +31,12 @@
         "ext-json": "*",
         "ext-simplexml": "*",
         "phpunit/php-code-coverage": "^9.0 || ^10.0",
-        "symfony/console": ">=2.7 <7.0",
-        "symfony/finder": ">=2.7 <7.0"
+        "symfony/console": ">=2.7 <8.0",
+        "symfony/finder": ">=2.7 <8.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.3 || ^10.0",
-        "symfony/filesystem": ">=2.7 <7.0",
+        "symfony/filesystem": ">=2.7 <8.0",
         "phpspec/prophecy": "^1.0",
         "php-parallel-lint/php-parallel-lint": "^1.4"
     },

diff --git a/src/PhpunitMerger/Command/CoverageCommand.php b/src/PhpunitMerger/Command/CoverageCommand.php
@@ -54,7 +54,7 @@ protected function configure()
             );
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $finder = new Finder();
         $finder->files()

diff --git a/src/PhpunitMerger/Command/LogCommand.php b/src/PhpunitMerger/Command/LogCommand.php
@@ -38,7 +38,7 @@ protected function configure()
             );
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $finder = new Finder();
         $finder->files()