Merge pull request #35 from klnjmm/feature/symfony-compatibility

Rendre compatible avec Symfony 6.0
BedrockStreaming · Apr 28, 2022 · 76f4cd8 · 76f4cd8
2 parents b11db95 + ce7b2c5
commit 76f4cd8
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,7 +8,10 @@ jobs:
     strategy:
       matrix:
         php-version: [ '7.4', '8.0', '8.1' ]
-        symfony-version: ['^4.4', '^5.0', '^5.3']
+        symfony-version: ['^4.4', '^5.0', '^5.3', '^6.0']
+        exclude:
+                - php-version: '7.4'
+                  symfony-version: '^6.0'
       fail-fast: false
     steps:
       - uses: actions/checkout@master

diff --git a/composer.json b/composer.json
@@ -17,12 +17,12 @@
     "require-dev": {
         "atoum/atoum":                      "^4.0",
         "m6web/php-cs-fixer-config":        "^2.0",
-        "symfony/dependency-injection":     "^4.4||^5.0",
-        "symfony/event-dispatcher":         "^4.4||^5.0",
-        "symfony/config":                   "^4.4||^5.0",
-        "symfony/yaml":                     "^4.4||^5.0",
-        "symfony/http-foundation":          "^4.4||^5.0",
-        "symfony/http-kernel":              "^4.4||^5.0"
+        "symfony/dependency-injection":     "^4.4||^5.0||^6.0",
+        "symfony/event-dispatcher":         "^4.4||^5.0||^6.0",
+        "symfony/config":                   "^4.4||^5.0||^6.0",
+        "symfony/yaml":                     "^4.4||^5.0||^6.0",
+        "symfony/http-foundation":          "^4.4||^5.0||^6.0",
+        "symfony/http-kernel":              "^4.4||^5.0||^6.0"
     },
     "autoload": {
         "psr-0": { "": "src/" }

diff --git a/src/M6Web/Bundle/ElasticsearchBundle/DependencyInjection/M6WebElasticsearchExtension.php b/src/M6Web/Bundle/ElasticsearchBundle/DependencyInjection/M6WebElasticsearchExtension.php
@@ -41,10 +41,7 @@ public function load(array $configs, ContainerBuilder $container)
         }
     }
 
-    /**
-     * @return string
-     */
-    public function getAlias()
+    public function getAlias(): string
     {
         return 'm6web_elasticsearch';
     }

diff --git a/src/M6Web/Bundle/ElasticsearchBundle/M6WebElasticsearchBundle.php b/src/M6Web/Bundle/ElasticsearchBundle/M6WebElasticsearchBundle.php
@@ -2,6 +2,7 @@
 
 namespace M6Web\Bundle\ElasticsearchBundle;
 
+use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**
@@ -12,7 +13,7 @@ class M6WebElasticsearchBundle extends Bundle
     /**
      * @return DependencyInjection\M6WebElasticsearchExtension|\Symfony\Component\DependencyInjection\Extension\ExtensionInterface|null
      */
-    public function getContainerExtension()
+    public function getContainerExtension(): ?ExtensionInterface
     {
         return new DependencyInjection\M6WebElasticsearchExtension();
     }