Merge pull request #2 from erfolgswerkzeug-software/feature/sw6.6

Update for SW 6.6
Werkstattl · Jul 16, 2024 · 7fa319a · 7fa319a
2 parents d69e875 + e9f3b13
commit 7fa319a
Show file tree

Hide file tree

Showing 151 changed files with 3,976 additions and 15,532 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,12 +11,12 @@ jobs:
 
     steps:
       - name: Clone Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.1
+          php-version: 8.2
 
       - name: Install Dependencies
         run: make dev -B
@@ -31,12 +31,12 @@ jobs:
     steps:
 
       - name: Clone Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.1
+          php-version: 8.2
 
       - name: Install Dependencies
         run: make dev -B
@@ -51,12 +51,12 @@ jobs:
     steps:
 
       - name: Clone Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.1
+          php-version: 8.2
 
       - name: Install Dependencies
         run: make dev -B
@@ -71,22 +71,22 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        shopware: [ '6.5.0.0',]
+        shopware: [ '6.6.0.0',]
     steps:
       - name: Clone Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.1
+          php-version: 8.2
 
       - name: Install PROD Dependencies
         run: make dev -B
 
       - name: Start Docker
         run: |
-          docker run --rm --name shop --env PHP_VERSION=8.1 -d dockware/dev:${{ matrix.shopware }}
+          docker run --rm --name shop --env PHP_VERSION=8.2 -d dockware/dev:${{ matrix.shopware }}
           sleep 30
           docker logs shop
       - name: Upload into Docker

diff --git a/.github/workflows/ci_pipe.yml b/.github/workflows/ci_pipe.yml
@@ -8,12 +8,12 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             -   name: Clone Code
-                uses: actions/checkout@v2
+                uses: actions/checkout@v4
 
             -   name: Setup PHP
                 uses: shivammathur/setup-php@v2
                 with:
-                    php-version: 8.1
+                    php-version: 8.2
 
             -   name: Install Dependencies
                 run: make dev -B
@@ -28,12 +28,12 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             -   name: Clone Code
-                uses: actions/checkout@v2
+                uses: actions/checkout@v4
 
             -   name: Setup PHP
                 uses: shivammathur/setup-php@v2
                 with:
-                    php-version: 8.1
+                    php-version: 8.2
 
             -   name: PHP Syntax Checks
                 run: make phpcheck -B
@@ -44,10 +44,10 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                php: [ '8.1' ]
+                php: [ '8.2' ]
         steps:
             - name: Clone Code
-              uses: actions/checkout@v2
+              uses: actions/checkout@v4
 
             - name: Setup PHP
               uses: shivammathur/setup-php@v2
@@ -66,10 +66,10 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                php: [ '8.1' ]
+                php: [ '8.2' ]
         steps:
             - name: Clone Code
-              uses: actions/checkout@v2
+              uses: actions/checkout@v4
 
             - name: Setup PHP
               uses: shivammathur/setup-php@v2
@@ -89,12 +89,12 @@ jobs:
         steps:
 
             - name: Clone Code
-              uses: actions/checkout@v2
+              uses: actions/checkout@v4
 
             - name: Setup PHP
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: 8.1
+                  php-version: 8.2
 
             - name: Install Dependencies
               run: make dev -B
@@ -110,16 +110,16 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                shopware: [ '6.5.0.0' ]
+                shopware: [ '6.6.0.0' ]
         steps:
 
             - name: Clone Code
-              uses: actions/checkout@v2
+              uses: actions/checkout@v4
 
             - name: Setup PHP
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: 8.1
+                  php-version: 8.2
 
             - name: Install PROD Dependencies
               run: make install -B
@@ -151,25 +151,24 @@ jobs:
             fail-fast: false
             matrix:
                 include:
-                    - shopware: '6.5.0.0'
-                      php: '8.1'
+                    - shopware: '6.6.0.0'
+                      php: '8.2'
         steps:
 
             - name: Clone Code
-              uses: actions/checkout@v2
+              uses: actions/checkout@v4
 
             - name: Download Docker
               run: |
                   docker pull dockware/dev:${{ matrix.shopware }}
 
             - name: Start Docker
               run: |
-                  docker run --rm -p 443:443 --name shop --env PHP_VERSION=${{ matrix.php }} -d dockware/dev:${{ matrix.shopware }}
+                  docker run --rm -p 443:443 --name shop --env PHP_VERSION=${{ matrix.php }} --env SHOP_DOMAIN=www.blog.local -d dockware/dev:${{ matrix.shopware }}
                   sleep 30
                   docker logs shop
                   # now change the domain of our shop, blog doesn't work with localhost
-                  sudo echo "127.0.0.1 local.blog.shop" | sudo tee -a /etc/hosts
-                  docker exec shop bash -c "mysql -u root -proot shopware -e \"UPDATE sales_channel_domain SET url='https://local.blog.shop' WHERE url NOT LIKE 'default.%';\""
+                  sudo echo "127.0.0.1 www.blog.local" | sudo tee -a /etc/hosts
 
             - name: Upload into Docker
               run: |
@@ -191,10 +190,10 @@ jobs:
               run: cd tests/Cypress && make install -B
 
             - name: Prepare Cypress
-              run: cd tests/Cypress && cp cypress.example.json cypress.json
+              run: cd tests/Cypress && cp cypress.config.example.js cypress.config.js
 
             - name: Start Cypress
-              run: cd tests/Cypress && make run shopware=${{ matrix.shopware }} url=https://local.blog.shop
+              run: cd tests/Cypress && make run shopware=${{ matrix.shopware }} url=https://www.blog.local
 
             - name: Download Logs
               if: ${{ always() }}

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -9,12 +9,12 @@ jobs:
 
     steps:
       - name: Clone Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.1
+          php-version: 8.2
 
       - name: Install Dependencies
         run: make dev -B
@@ -29,12 +29,12 @@ jobs:
     steps:
 
       - name: Clone Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.1
+          php-version: 8.2
 
       - name: Install Dependencies
         run: make dev -B
@@ -49,12 +49,12 @@ jobs:
     steps:
 
       - name: Clone Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.1
+          php-version: 8.2
 
       - name: Install Dependencies
         run: make dev -B
@@ -63,25 +63,25 @@ jobs:
         run: make stan -B
 
   integrationphp81:
-    name: Integration Tests | Shopware ${{ matrix.shopware }} | PHP 8.1
+    name: Integration Tests | Shopware ${{ matrix.shopware }} | PHP 8.2
     needs: phpstan
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        shopware: [ '6.5.0.0' ]
+        shopware: [ '6.6.0.0' ]
     steps:
       - name: Clone Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.1
+          php-version: 8.2
 
       - name: Start Docker
         run: |
-          docker run --rm --name shop --env PHP_VERSION=8.1 -d dockware/dev:${{ matrix.shopware }}
+          docker run --rm --name shop --env PHP_VERSION=8.2 -d dockware/dev:${{ matrix.shopware }}
           sleep 30
           docker logs shop
       - name: Upload into Docker

diff --git a/.php_cs.php b/.php_cs.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 $finder = PhpCsFixer\Finder::create()
     ->in('src')
@@ -7,29 +8,29 @@
 
 return PhpCsFixer\Config::create()
     ->setRules([
-        '@PSR2'                               => true,
-        'single_quote'                        => true,
-        'function_typehint_space'             => true,
-        'hash_to_slash_comment'               => true,
-        'method_separation'                   => true,
-        'no_blank_lines_after_phpdoc'         => true,
-        'no_unused_imports'                   => true,
-        'no_useless_else'                     => true,
-        'phpdoc_align'                        => true,
-        'phpdoc_order'                        => true,
-        'phpdoc_scalar'                       => true,
-        'pre_increment'                       => true,
-        'short_scalar_cast'                   => true,
-        'space_after_semicolon'               => true,
-        'ternary_operator_spaces'             => true,
-        'trailing_comma_in_multiline_array'   => true,
-        'semicolon_after_instruction'         => true,
-        'trim_array_spaces'                   => true,
-        'whitespace_after_comma_in_array'     => true,
+        '@PSR2' => true,
+        'single_quote' => true,
+        'function_typehint_space' => true,
+        'hash_to_slash_comment' => true,
+        'method_separation' => true,
+        'no_blank_lines_after_phpdoc' => true,
+        'no_unused_imports' => true,
+        'no_useless_else' => true,
+        'phpdoc_align' => true,
+        'phpdoc_order' => true,
+        'phpdoc_scalar' => true,
+        'pre_increment' => true,
+        'short_scalar_cast' => true,
+        'space_after_semicolon' => true,
+        'ternary_operator_spaces' => true,
+        'trailing_comma_in_multiline_array' => true,
+        'semicolon_after_instruction' => true,
+        'trim_array_spaces' => true,
+        'whitespace_after_comma_in_array' => true,
         'phpdoc_add_missing_param_annotation' => true,
-        'ordered_imports'                     => true,
-        'binary_operator_spaces'              => ['align_equals' => false, 'align_double_arrow' => true],
-        'concat_space'                        => ['spacing' => 'one'],
-        'array_syntax'                        => ['syntax' => 'short'],
+        'ordered_imports' => true,
+        'binary_operator_spaces' => ['align_equals' => false, 'align_double_arrow' => true],
+        'concat_space' => ['spacing' => 'one'],
+        'array_syntax' => ['syntax' => 'short'],
     ])
     ->setFinder($finder);
diff --git a/CHANGELOG_de-DE.md b/CHANGELOG_de-DE.md
@@ -1,3 +1,6 @@
+# 3.0.0
+- Kompatibilität mit Shopware 6.6
+
 # 2.10.0
 - Überprüfte die Liste der Blog-IDs, bevor der Cache ungültig gemacht wurde.
 

diff --git a/CHANGELOG_en-GB.md b/CHANGELOG_en-GB.md
@@ -1,3 +1,6 @@
+# 3.0.0
+- Compatibility with Shopware 6.6
+
 # 2.10.0
 - Checked list of blog ids before invalidating cache
 

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "thomaspeissl/blog-module-mit",
     "description": "Blog Module MIT",
-    "version": "2.10.0",
+    "version": "3.0.0",
     "type": "shopware-platform-plugin",
     "keywords": ["blog", "news"],
     "license":"MIT",
@@ -13,17 +13,17 @@
         }
     ],
     "require": {
-        "shopware/core": "^6.5.0.0",
-        "shopware/administration": "^6.5.0.0",
-        "shopware/storefront": "^6.5.0.0"
+        "shopware/core": "^6.6.0.0",
+        "shopware/administration": "^6.6.0.0",
+        "shopware/storefront": "^6.6.0.0"
     },
     "require-dev":{
         "phpunit/phpunit": "^9.5",
-        "symplify/easy-coding-standard": "^9.3.12",
-        "phpstan/phpstan": "^1.8",
+        "symplify/easy-coding-standard": "^12.1.14",
+        "kubawerlos/php-cs-fixer-custom-fixers": "^3.16",
+        "phpstan/phpstan": "^1.10",
         "phpcompatibility/php-compatibility": "^9.3",
-        "squizlabs/php_codesniffer": "^3.6",
-        "infection/infection": "^0.25.4"
+        "infection/infection": "^0.29.6"
     },
     "extra": {
         "shopware-plugin-class": "Sas\\BlogModule\\SasBlogModule",