Merge pull request #36 from jerowork/master

Support Symfony 7.0
overblog · Feb 1, 2024 · dfc4bdc · dfc4bdc
2 parents 4cdc87b + 6a83580
commit dfc4bdc
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -22,10 +22,14 @@ jobs:
                 symfony-version:
                     - '5.4.*'
                     - '6.3.*'
+                    - '7.0.*'
                 dependencies:
                     - 'lowest'
                     - 'highest'
                 remove-dependencies: [ '' ]
+                exclude:
+                  - php-version: '8.1'
+                    symfony-version: '7.0.*'
 
         steps:
             - name: "Checkout"

diff --git a/composer.json b/composer.json
@@ -27,14 +27,14 @@
     "require": {
         "php": "^8.1",
         "overblog/dataloader-php": "^1",
-        "symfony/dependency-injection": "^5.4 || ^6.3"
+        "symfony/dependency-injection": "^5.4 || ^6.3 || ^7.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^10.3",
         "react/promise": "^2.8.0",
-        "symfony/framework-bundle": "^5.4||^6.3",
-        "symfony/phpunit-bridge": "^6.3",
-        "symfony/yaml": "^5.4 || ^6.3"
+        "symfony/framework-bundle": "^5.4||^6.3 || ^7.0",
+        "symfony/phpunit-bridge": "^6.3 || ^7.0",
+        "symfony/yaml": "^5.4 || ^6.3 || ^7.0"
     },
     "extra": {
         "branch-alias": {

diff --git a/tests/Functional/TestCase.php b/tests/Functional/TestCase.php
@@ -13,7 +13,7 @@
 
 use Overblog\DataLoaderBundle\Tests\Functional\app\AppKernel;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
-use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\HttpKernel\KernelInterface;
 
@@ -49,7 +49,7 @@ public static function setUpBeforeClass(): void
         $fs->remove(sys_get_temp_dir().'/OverblogDataLoaderBundle/');
     }
 
-    protected static function getContainer(): ContainerInterface
+    protected static function getContainer(): Container
     {
         return static::$kernel->getContainer();
     }