Merge pull request #23 from dachcom-digital/p11

Pimcore 11 Support
dachcom-digital · Sep 21, 2023 · 5b0f270 · 5b0f270
2 parents fdf38b7 + f3e39f2
commit 5b0f270
Show file tree

Hide file tree

Showing 62 changed files with 252 additions and 273 deletions.
diff --git a/.github/workflows/codeception.yml b/.github/workflows/codeception.yml
@@ -15,10 +15,10 @@ jobs:
             TEST_PROJECT_ROOT_DIR: "${{ github.workspace }}"
 
             PIMCORE_CODECEPTION_FRAMEWORK: "${{ github.workspace }}/pimcore-codeception-framework"
-            PIMCORE_CODECEPTION_VERSION: "2.0"
+            PIMCORE_CODECEPTION_VERSION: "3.0"
 
             APP_ENV: test
-            PIMCORE_TEST_DB_DSN: "mysql://root:root@127.0.0.1:3306/dachcom_bundle_test"
+            PIMCORE_TEST_DB_DSN: "mysql://test:test@127.0.0.1:3306/dachcom_bundle_test"
             PIMCORE_TEST_URL: "http://localhost"
             PIMCORE_CLASS_DIRECTORY: "${{ github.workspace }}/lib/test-bundle/tests/_output/var/classes/DataObject"
 
@@ -38,12 +38,12 @@ jobs:
                 options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
         strategy:
             matrix:
-                php: [ 8.1 ]
-                symfony: [ ^5.4 ]
-                pimcore: [ ~10.6.0 ]
+                php: [ 8.2 ]
+                symfony: [ ^6.2 ]
+                pimcore: [ ~11.0.0 ]
                 include:
-                    -   pimcore: ~10.6.0
-                        template_tag: v10.2.5
+                    -   pimcore: ~11.0.0
+                        template_tag: v11.0.0
         steps:
             -   uses: actions/checkout@v2
                 with:
@@ -82,9 +82,19 @@ jobs:
                 run: php -v
 
             -   name: Setup MySql
-                run: |
-                    sudo systemctl start mysql
-                    mysql -uroot -proot -h127.0.0.1 -e "CREATE DATABASE dachcom_bundle_test CHARSET=utf8mb4;"
+                uses: shogo82148/actions-setup-mysql@v1
+                with:
+                    mysql-version: '8.0'
+                    user: test
+                    password: test
+                    root-password: root
+                    auto-start: true
+                    my-cnf: |
+                        max_allowed_packet=32505856
+                        max_connections=1000
+
+            -   name: Initial Database
+                run: mysql -utest -ptest -h127.0.0.1 -e 'CREATE DATABASE dachcom_bundle_test CHARSET=utf8mb4;'
 
             -   name: Setup Chromium
                 run: |
@@ -115,7 +125,7 @@ jobs:
                 run: |
                     composer config "minimum-stability" "dev"
                     composer config "prefer-stable" true
-                    sed -i 's,\("dachcom-digital\/dynamic-search"\): "\(.*\)",\1: "2.x-dev",g' ${{ github.workspace }}/lib/test-bundle/composer.json
+                    sed -i 's,\("dachcom-digital\/dynamic-search"\): "\(.*\)",\1: "3.x-dev",g' ${{ github.workspace }}/lib/test-bundle/composer.json
                     chmod +x ./pimcore-codeception-framework/src/_etc/scripts/composer.sh
                     ./pimcore-codeception-framework/src/_etc/scripts/composer.sh
 

diff --git a/.github/workflows/ecs.yml b/.github/workflows/ecs.yml
@@ -15,7 +15,7 @@ jobs:
             TEST_PROJECT_ROOT_DIR: "${{ github.workspace }}"
 
             PIMCORE_CODECEPTION_FRAMEWORK: "${{ github.workspace }}/pimcore-codeception-framework"
-            PIMCORE_CODECEPTION_VERSION: "2.0"
+            PIMCORE_CODECEPTION_VERSION: "3.0"
 
             APP_ENV: test
             PIMCORE_TEST_DB_DSN: "mysql://root:[email protected]:3306/dachcom_bundle_test"
@@ -37,12 +37,12 @@ jobs:
                 options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
         strategy:
             matrix:
-                php: [ 8.1 ]
-                symfony: [ ^5.4 ]
-                pimcore: [ ~10.6.0 ]
+                php: [ 8.2 ]
+                symfony: [ ^6.2 ]
+                pimcore: [ ~11.0.0 ]
                 include:
-                    -   pimcore: ~10.6.0
-                        template_tag: v10.2.5
+                    -   pimcore: ~11.0.0
+                        template_tag: v11.0.0
         steps:
             -   uses: actions/checkout@v2
                 with:
@@ -105,7 +105,7 @@ jobs:
                 run: |
                     composer config "minimum-stability" "dev"
                     composer config "prefer-stable" true
-                    sed -i 's,\("dachcom-digital\/dynamic-search"\): "\(.*\)",\1: "2.x-dev",g' ${{ github.workspace }}/lib/test-bundle/composer.json
+                    sed -i 's,\("dachcom-digital\/dynamic-search"\): "\(.*\)",\1: "3.x-dev",g' ${{ github.workspace }}/lib/test-bundle/composer.json
                     chmod +x ./pimcore-codeception-framework/src/_etc/scripts/composer.sh
                     ./pimcore-codeception-framework/src/_etc/scripts/composer.sh
 

diff --git a/.github/workflows/php-stan.yml b/.github/workflows/php-stan.yml
@@ -15,7 +15,7 @@ jobs:
             TEST_PROJECT_ROOT_DIR: "${{ github.workspace }}"
 
             PIMCORE_CODECEPTION_FRAMEWORK: "${{ github.workspace }}/pimcore-codeception-framework"
-            PIMCORE_CODECEPTION_VERSION: "2.0"
+            PIMCORE_CODECEPTION_VERSION: "3.0"
 
             APP_ENV: test
             PIMCORE_TEST_DB_DSN: "mysql://root:[email protected]:3306/dachcom_bundle_test"
@@ -37,12 +37,12 @@ jobs:
                 options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
         strategy:
             matrix:
-                php: [ 8.1 ]
-                symfony: [ ^5.4 ]
-                pimcore: [ ~10.6.0 ]
+                php: [ 8.2 ]
+                symfony: [ ^6.2 ]
+                pimcore: [ ~11.0.0 ]
                 include:
-                    -   pimcore: ~10.6.0
-                        template_tag: v10.2.5
+                    -   pimcore: ~11.0.0
+                        template_tag: v11.0.0
         steps:
             -   uses: actions/checkout@v2
                 with:
@@ -105,7 +105,7 @@ jobs:
                 run: |
                     composer config "minimum-stability" "dev"
                     composer config "prefer-stable" true
-                    sed -i 's,\("dachcom-digital\/dynamic-search"\): "\(.*\)",\1: "2.x-dev",g' ${{ github.workspace }}/lib/test-bundle/composer.json
+                    sed -i 's,\("dachcom-digital\/dynamic-search"\): "\(.*\)",\1: "3.x-dev",g' ${{ github.workspace }}/lib/test-bundle/composer.json
                     chmod +x ./pimcore-codeception-framework/src/_etc/scripts/composer.sh
                     ./pimcore-codeception-framework/src/_etc/scripts/composer.sh
 

diff --git a/.gitignore b/.gitignore
@@ -45,11 +45,11 @@ Vagrantfile
 php-cgi.core
 .sass-cache
 
-# codeception (only stage *.dist.yml config files)
-/codeception.yml
-/tests/codeception.yml
-/tests/*.suite.yml
+# codeception (only stage *.dist.yaml config files)
+/codeception.yaml
+/tests/codeception.yaml
+/tests/*.suite.yaml
 /tests/_output/*
 /tests/_data/*
 !/tests/_data/.gitkeep
-/tests/_support/_generated/*
+/tests/Support/_generated/*
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,5 +1,5 @@
 # License
-Copyright (C) 2021 DACHCOM.DIGITAL
+Copyright (C) 2023 DACHCOM.DIGITAL
 
 This software is available under the GNU General Public License version 3 (GPLv3).
 

diff --git a/README.md b/README.md
@@ -12,16 +12,17 @@ Store data with the elasticsearch index service.
 ## Release Plan
 | Release | Supported Pimcore Versions | Supported Symfony Versions | Release Date | Maintained           | Branch                                                                                                 |
 |---------|----------------------------|----------------------------|--------------|----------------------|--------------------------------------------------------------------------------------------------------|
-| **2.x** | `10.0` - `10.6`            | `^5.4`                     | 19.12.2021   | Yes (Bugs, Features) | master                                                                                                 |
+| **3.x** | `11.0`                     | `^6.2`                     | --           | Yes (Bugs, Features) | master                                                                                                 |
+| **2.x** | `10.0` - `10.6`            | `^5.4`                     | 19.12.2021   | No                   | [2.x](https://github.com/dachcom-digital/pimcore-dynamic-search-index-provider-elasticsearch/tree/2.x) |
 | **1.x** | `6.6` - `6.9`              | `^4.4`                     | 18.04.2021   | No                   | [1.x](https://github.com/dachcom-digital/pimcore-dynamic-search-index-provider-elasticsearch/tree/1.x) |
 
 ***
 
 ## Installation  
 ```json
 "require" : {
-    "dachcom-digital/dynamic-search" : "~2.0.0",
-    "dachcom-digital/dynamic-search-index-provider-elasticsearch" : "~2.0.0"
+    "dachcom-digital/dynamic-search" : "~3.0.0",
+    "dachcom-digital/dynamic-search-index-provider-elasticsearch" : "~3.0.0"
 }
 ```
 
@@ -30,7 +31,7 @@ You need to install / enable the Dynamic Search Bundle first.
 Read more about it [here](https://github.com/dachcom-digital/pimcore-dynamic-search#installation).
 After that, proceed as followed:
 
-### Enabling via `config/bundles.php`:
+Add Bundle to `bundles.php`:
 ```php
 <?php
 
@@ -39,23 +40,6 @@ return [
 ];
 ```
 
-### Enabling via `Kernel.php`:
-```php
-<?php
-
-namespace App;
-
-use Pimcore\HttpKernel\BundleCollection\BundleCollection;
-
-class Kernel extends \Pimcore\Kernel
-{
-    public function registerBundlesToCollection(BundleCollection $collection): void
-    {
-        $collection->addBundle(new \DsElasticSearchBundle\DsElasticSearchBundle());
-    }
-}
-```
-
 ***
 
 ## Basic Setup
@@ -122,20 +106,20 @@ dynamic_search:
 
 ## Provider Options
 
-| Name                                 | Default Value          | Description |
-|:-------------------------------------|:-----------------------|:------------|
-|`index`                               | []                     |             |
-|`analysis`                            | []                     |             |
+| Name       | Default Value | Description |
+|:-----------|:--------------|:------------|
+| `index`    | []            |             |
+| `analysis` | []            |             |
 
 ***
 
 ## Index Fields
 **Available Index Fields**:   
 
-| Name              | Description |
-|:------------------|:------------|
-|`dynamic`           | TBD |
-|`explicit`          | TBD |
+| Name       | Description |
+|:-----------|:------------|
+| `dynamic`  | TBD         |
+| `explicit` | TBD         |
 
 ***
 
@@ -148,9 +132,9 @@ You're able to modify the search by hooking via `dynamic_search.output_channel.m
 **Identifier**: `elasticsearch_search`   
 **Available Options**:   
 
-| Name                             | Default Value | Description |
-|:---------------------------------|:--------------|:------------|
-|`result_limit`                    | 10            |             |
+| Name           | Default Value | Description |
+|:---------------|:--------------|:------------|
+| `result_limit` | 10            |             |
 
 ### Multi Search
 **Identifier**: `TBD`   

diff --git a/UPGRADE.md b/UPGRADE.md
@@ -1,12 +1,10 @@
 # Upgrade Notes
 
-### 2.0.2
-- [FEATURE] template improvements for aggreagtion filter [#10](https://github.com/dachcom-digital/pimcore-dynamic-search-index-provider-elasticsearch/issues/10)
+## Migrating from Version 2.x to Version 3.0.0
 
-### 2.0.1
-- [BUGFIX] Fix field for filter's term query [#7](https://github.com/dachcom-digital/pimcore-dynamic-search-index-provider-elasticsearch/issues/7)
+### Global Changes
+- Recommended folder structure by symfony adopted
 
-## Migrating from Version 1.x to Version 2.0.0
+***
 
-### Global Changes
-- PHP8 return type declarations added: you may have to adjust your extensions accordingly
+2.x Upgrade Notes: https://github.com/dachcom-digital/pimcore-dynamic-search-index-provider-elasticsearch/blob/2.x/UPGRADE.md
diff --git a/codeception.dist.yml b/codeception.dist.yml
@@ -1,14 +1,15 @@
 namespace: DachcomBundle\Test
+support_namespace: Support
 actor: Tester
 paths:
     tests: tests
-    output: tests/_output
-    data: tests/_data
-    support: tests/_support
     envs: tests/_envs
+    output: tests/_output
     log: tests/_output/var/logs
+    data: tests/_data
+    support: tests/Support
+bootstrap: _bootstrap.php
 settings:
-    bootstrap: _bootstrap.php
     memory_limit: -1
     colors: true
 params:

diff --git a/composer.json b/composer.json
@@ -15,7 +15,7 @@
     ],
     "autoload": {
         "psr-4": {
-            "DsElasticSearchBundle\\": "src/DsElasticSearchBundle"
+            "DsElasticSearchBundle\\": "src/"
         }
     },
     "autoload-dev": {
@@ -24,16 +24,16 @@
         }
     },
     "require": {
-        "pimcore/pimcore": "^10.1",
-        "dachcom-digital/dynamic-search": "^2.0",
+        "pimcore/pimcore": "^11.0",
+        "dachcom-digital/dynamic-search": "^3.0",
         "elasticsearch/elasticsearch": "^7.0",
         "handcraftedinthealps/elasticsearch-dsl": "^7.0"
     },
     "require-dev": {
-        "codeception/codeception": "^4.1",
-        "codeception/module-symfony": "^1.6",
-        "phpstan/phpstan": "^0.12",
-        "phpstan/phpstan-symfony": "^0.12",
+        "codeception/codeception": "^5.0",
+        "codeception/module-symfony": "^3.1",
+        "phpstan/phpstan": "^1.0",
+        "phpstan/phpstan-symfony": "^1.0",
         "symplify/easy-coding-standard": "^9.0"
     }
 }
diff --git a/...earchBundle/Resources/config/services.yml → config/services.yaml b/...earchBundle/Resources/config/services.yml → config/services.yaml
@@ -1,5 +1,5 @@
 imports:
-    - { resource: services/*.yml }
+    - { resource: services/*.yaml }
 
 services:
 

diff --git a/...dle/Resources/config/services/builder.yml → config/services/builder.yaml b/...dle/Resources/config/services/builder.yml → config/services/builder.yaml
diff --git a/...dle/Resources/config/services/command.yml → config/services/command.yaml b/...dle/Resources/config/services/command.yml → config/services/command.yaml
diff --git a/...s/config/services/document-normalizer.yml → config/services/document-normalizer.yaml b/...s/config/services/document-normalizer.yml → config/services/document-normalizer.yaml
diff --git a/...ndle/Resources/config/services/fields.yml → config/services/fields.yaml b/...ndle/Resources/config/services/fields.yml → config/services/fields.yaml
diff --git a/...ndle/Resources/config/services/filter.yml → config/services/filter.yaml b/...ndle/Resources/config/services/filter.yml → config/services/filter.yaml
diff --git a/...ources/config/services/output-channel.yml → config/services/output-channel.yaml b/...ources/config/services/output-channel.yml → config/services/output-channel.yaml
diff --git a/...le/Resources/config/services/provider.yml → config/services/provider.yaml b/...le/Resources/config/services/provider.yml → config/services/provider.yaml
diff --git a/phpstan.neon b/phpstan.neon
@@ -6,4 +6,5 @@ parameters:
     reportUnmatchedIgnoredErrors: false
     symfony:
         container_xml_path: %currentWorkingDirectory%/var/cache/test/TestKernelTestDebugContainer.xml
-    ignoreErrors:
+    ignoreErrors:
+        - '#Access to an undefined property DynamicSearchBundle\\OutputChannel\\Query\\SearchContainerInterface::\$result\.#'
diff --git a/...ticSearchBundle/Builder/ClientBuilder.php → src/Builder/ClientBuilder.php b/...ticSearchBundle/Builder/ClientBuilder.php → src/Builder/ClientBuilder.php
@@ -7,11 +7,8 @@
 
 class ClientBuilder implements ClientBuilderInterface
 {
-    protected LoggerInterface $logger;
-
-    public function __construct(LoggerInterface $logger)
+    public function __construct(protected LoggerInterface $logger)
     {
-        $this->logger = $logger;
     }
 
     public function build(array $indexOptions): Client
@@ -28,4 +25,4 @@ public function build(array $indexOptions): Client
 
         return $client->build();
     }
-}
+}
diff --git a/...Bundle/Builder/ClientBuilderInterface.php → src/Builder/ClientBuilderInterface.php b/...Bundle/Builder/ClientBuilderInterface.php → src/Builder/ClientBuilderInterface.php