Allow Symfony 7 versions

handcraftedinthealps · Jul 16, 2024 · b2a589d · b2a589d
1 parent ab0f1ad
commit b2a589d
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 21 deletions.
diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml
@@ -70,6 +70,30 @@ jobs:
                       elasticsearch-package-constraint: '^7.0'
                       env: {}
 
+                    - php-version: '8.2'
+                      job-name-prefix: 'Allow to fail: '
+                      elasticsearch-version: '7.11.1'
+                      lint: true
+                      symfony-version: '^6.0'
+                      elasticsearch-package-constraint: '^7.0'
+                      env: {}
+
+                    - php-version: '8.3'
+                      job-name-prefix: 'Allow to fail: '
+                      elasticsearch-version: '7.11.1'
+                      lint: true
+                      symfony-version: '^6.0'
+                      elasticsearch-package-constraint: '^7.0'
+                      env: {}
+
+                    - php-version: '8.4'
+                      job-name-prefix: 'Allow to fail: '
+                      elasticsearch-version: '7.11.1'
+                      lint: true
+                      symfony-version: '^6.0'
+                      elasticsearch-package-constraint: '^7.0'
+                      env: {}
+
         services:
             elasticsearch:
                 image: docker.elastic.co/elasticsearch/elasticsearch:${{ matrix.elasticsearch-version }}

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -23,7 +23,7 @@ class Configuration implements ConfigurationInterface
     /**
      * {@inheritdoc}
      */
-    public function getConfigTreeBuilder()
+    public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('ongr_elasticsearch');
 

diff --git a/README.md b/README.md
@@ -3,10 +3,10 @@
 This is a fork of the [ongr/elasticsearch-bundle](https://github.com/ongr-io/elasticsearchbundle).
 With some basic changes to support wider range of Symfony Versions.
 
-| Version   | Supported Elasticsearch Version | Supported Symfony Version      |
-|-----------|---------------------------------|--------------------------------|
-| `5.x`     | `^7.0, ^6.0, ^5.0`              | `^6.0, ^5.0, ^4.0, ^3.4, ^2.8` |
-| `1.x`     | `^1.0, ^2.0`                    | `^3.0, ^2.7`                   |
+| Version   | Supported Elasticsearch Version | Supported Symfony Version            |
+|-----------|---------------------------------|--------------------------------------|
+| `5.x`     | `^7.0, ^6.0, ^5.0`              | `^7.0, ^6.0, ^5.0, ^4.0, ^3.4, ^2.8` |
+| `1.x`     | `^1.0, ^2.0`                    | `^3.0, ^2.7`                         |
 
 ## Documentation
 

diff --git a/composer.json b/composer.json
@@ -16,31 +16,31 @@
     ],
     "require": {
         "php": "^7.2|^8.0",
-        "symfony/framework-bundle": "^2.8|^3.0|^4|^5|^6",
-        "symfony/console": "^2.8|^3.0|^4|^5|^6",
-        "symfony/stopwatch": "^2.8|^3.0|^4|^5|^6",
-        "symfony/templating": "^2.8|^3.0|^4|^5|^6",
-        "symfony/asset": "^2.8|^3.0|^4|^5|^6",
+        "symfony/framework-bundle": "^2.8|^3.0|^4|^5|^6|^7",
+        "symfony/console": "^2.8|^3.0|^4|^5|^6|^7",
+        "symfony/stopwatch": "^2.8|^3.0|^4|^5|^6|^7",
+        "symfony/templating": "^2.8|^3.0|^4|^5|^6|^7",
+        "symfony/asset": "^2.8|^3.0|^4|^5|^6|^7",
         "doctrine/annotations": "^1.10",
         "doctrine/inflector": "^1.0 || ^2.0",
         "doctrine/cache": "~1.4",
-        "doctrine/collections": "~1.4",
+        "doctrine/collections": "^1.4|^2.0",
         "monolog/monolog": "^1.10 || ^2.0 || ^3.0",
         "handcraftedinthealps/elasticsearch-dsl": "^5.0.7.1|^6.2.0.1|^7.2.0.1",
-        "symfony/event-dispatcher": "^2.8|^3.0|^4|^5|^6"
+        "symfony/event-dispatcher": "^2.8|^3.0|^4|^5|^6|^7"
     },
     "require-dev": {
         "mikey179/vfsstream": "~1.4",
         "squizlabs/php_codesniffer": "^2.0|^3.0",
-        "symfony/browser-kit" : "^2.8|^3.4|^4|^5|^6",
-        "symfony/expression-language" : "^2.8|^3.4|^4|^5|^6",
-        "symfony/twig-bundle": "^2.8|^3.4|^4|^5|^6",
-        "symfony/serializer": "^2.8|^3.4|^4|^5|^6",
-        "symfony/yaml": "^2.8|^3.4|^4|^5|^6",
-        "symfony/phpunit-bridge": "^5.1|^6",
-        "symfony/dependency-injection": "^2.8|^3.4|^4|^5|^6",
-        "symfony/validator": "^2.8|^3.4|^4|^5|^6",
-        "symfony/options-resolver": "^2.8|^3.4|^4|^5|^6"
+        "symfony/browser-kit" : "^2.8|^3.4|^4|^5|^6|^7",
+        "symfony/expression-language" : "^2.8|^3.4|^4|^5|^6|^7",
+        "symfony/twig-bundle": "^2.8|^3.4|^4|^5|^6|^7",
+        "symfony/serializer": "^2.8|^3.4|^4|^5|^6|^7",
+        "symfony/yaml": "^2.8|^3.4|^4|^5|^6|^7",
+        "symfony/phpunit-bridge": "^5.1|^6|^7",
+        "symfony/dependency-injection": "^2.8|^3.4|^4|^5|^6|^7",
+        "symfony/validator": "^2.8|^3.4|^4|^5|^6|^7",
+        "symfony/options-resolver": "^2.8|^3.4|^4|^5|^6|^7"
     },
     "autoload": {
         "psr-4": { "ONGR\\ElasticsearchBundle\\": "" },