feat: error resolution

.github/workflows/acceptance.yaml

@@ -0,0 +1,99 @@
+name: Acceptance
+
+on:
+  schedule:
+    - cron: '0 3 * * *'  # nightly at 3 am utc
+  workflow_dispatch:
+    inputs:
+      update_snapshots:
+        description: 'Update snapshots'
+        required: false
+        type: boolean
+        default: false
+  push:
+    branches:
+      - trunk
+  pull_request:
+    paths:
+      - src/**
+      - tests/acceptance/**
+      - .github/workflows/acceptance.yaml
+
+jobs:
+  playwright:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        PLATFORM_BRANCH: ["trunk"]
+    services:
+      mysql:
+        image: mysql:8.0
+        env:
+          MYSQL_ROOT_PASSWORD: root
+          MYSQL_DATABASE: shopware
+        ports:
+          - 3306:3306
+    env:
+      DATABASE_URL: mysql://root:root@127.0.0.1:3306/shopware
+
+    steps:
+      - uses: shopware/github-actions/setup-extension@main
+        with:
+          extensionName: ${{ github.event.repository.name }}
+          shopwareVersion: ${{ matrix.PLATFORM_BRANCH }}
+          install: true
+          install-admin: true
+          install-storefront: false
+          mysqlVersion: skip
+          env: prod
+          extraRepositories: |
+            {
+              "${{ github.event.repository.name }}": {
+                "type": "path",
+                "url": "custom/plugins/${{ github.event.repository.name }}",
+                "symlink": true
+              }
+            }
+
+      - name: Setup Migration Assistant
+        run: |
+          composer run build:js:admin
+          cd custom/plugins/${{ github.event.repository.name }}/tests
+          mysql -uroot < _fixtures/database/shopware55corrupted.sql
+
+      - name: Cache Playwright browsers
+        uses: actions/cache@v4
+        with:
+          path: ~/.cache/ms-playwright
+          key: playwright-${{ runner.os }}-${{ hashFiles('custom/plugins/**/tests/acceptance/package-lock.json') }}
+
+      - name: Install playwright
+        working-directory: custom/plugins/${{ github.event.repository.name }}/tests/acceptance
+        run: |
+          npm ci
+          npx playwright install --with-deps
+
+      - name: Run Playwright
+        working-directory: custom/plugins/${{ github.event.repository.name }}/tests/acceptance
+        env:
+          DATABASE_URL: mysql://root:root@127.0.0.1:3306/shopware55
+          UPDATE_SNAPSHOTS: ${{ github.event.inputs.update_snapshots }}
+        run: npm run test
+
+      - uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: e2e-${{ github.event.repository.name }}-${{ github.sha }}-${{ matrix.PLATFORM_BRANCH }}
+          path: |
+            custom/plugins/${{ github.event.repository.name }}/tests/acceptance/test-results/
+            custom/plugins/${{ github.event.repository.name }}/tests/acceptance/playwright-report/
+          retention-days: 3
+
+      - name: Upload updated snapshots
+        if: github.event.inputs.update_snapshots == 'true'
+        uses: actions/upload-artifact@v4
+        with:
+          name: visual-snapshots-${{ matrix.PLATFORM_BRANCH }}
+          path: custom/plugins/${{ github.event.repository.name }}/tests/acceptance/snapshots/
+          retention-days: 3

.github/workflows/admin.yaml

@@ -13,8 +13,8 @@ on:
   workflow_call:
 
 jobs:
-  eslint:
-    name: ESLint
+  lint:
+    name: Lint
     runs-on: ubuntu-latest
     steps:
       - uses: shopware/github-actions/setup-extension@main
@@ -33,7 +33,9 @@ jobs:
             }
       - run: |
           composer -d custom/plugins/${{ github.event.repository.name }} run admin:install
-          composer -d custom/plugins/${{ github.event.repository.name }} run admin:lint
+          composer -d custom/plugins/${{ github.event.repository.name }} run lint:admin
+          composer -d custom/plugins/${{ github.event.repository.name }} run format:admin
+          composer -d custom/plugins/${{ github.event.repository.name }} run format:md
 
   stylelint:
     name: Stylelint
@@ -55,7 +57,7 @@ jobs:
             }
       - run: |
           composer -d custom/plugins/${{ github.event.repository.name }} run admin:install
-          composer -d custom/plugins/${{ github.event.repository.name }} run admin:lint:scss
+          composer -d custom/plugins/${{ github.event.repository.name }} run lint:admin:scss
 
   jest:
     name: Jest

.github/workflows/check-pr-title.yml

@@ -0,0 +1,33 @@
+name: Check PR title
+
+on:
+  pull_request:
+    types:
+      - opened
+      - reopened
+      - edited
+      - synchronize
+
+permissions:
+  pull-requests: read
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: amannn/action-semantic-pull-request@48f256284bd46cdaab1048c3721360e808335d50 # 6.1.1
+        with:
+          types: |
+            feat
+            fix
+            chore
+            docs
+            style
+            refactor
+            perf
+            test
+            build
+            ci
+            revert
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/integration.yaml

@@ -55,7 +55,7 @@ jobs:
             }
       - name: Import SW5 TestData DB
         working-directory: custom/plugins/${{ github.event.repository.name }}/tests
-        run: mysql -uroot < testData/sw55.sql
+        run: mysql -uroot < _fixtures/database/shopware55.sql
       - name: Run PHPUnit
         working-directory: custom/plugins/${{ github.event.repository.name }}
         run: php -d pcov.enabled=1 -d pcov.directory=${PWD} -d pcov.exclude='~(vendor|tests|node_modules)~' ${GITHUB_WORKSPACE}/vendor/bin/phpunit --configuration phpunit.xml.dist
@@ -79,63 +79,3 @@ jobs:
             }
       - name: Uninstall Plugin
         run: php bin/console plugin:uninstall ${{ github.event.repository.name }}
-
-  acceptance:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        PLATFORM_BRANCH: ["trunk"] # TODO add min version 6.7.0 here when trunk becomes > 6.7.0
-    services:
-      mysql:
-        image: mysql:8.0
-        env:
-          MYSQL_ROOT_PASSWORD: root
-          MYSQL_DATABASE: shopware
-        ports:
-          - 3306:3306
-    env:
-      DATABASE_URL: mysql://root:root@127.0.0.1:3306/shopware
-    steps:
-      - uses: shopware/github-actions/setup-extension@main
-        with:
-          extensionName: ${{ github.event.repository.name }}
-          shopwareVersion: ${{ matrix.PLATFORM_BRANCH }}
-          install: true
-          install-admin: true
-          install-storefront: true
-          mysqlVersion: skip
-          env: prod
-          extraRepositories: |
-            {
-              "${{ github.event.repository.name }}": {
-                "type": "path",
-                "url": "custom/plugins/${{ github.event.repository.name }}",
-                "symlink": true
-              }
-            }
-      - name: Setup Migration Assistant
-        run: |
-          composer run build:js:admin
-          cd custom/plugins/${{ github.event.repository.name }}/tests
-          mysql -uroot < testData/sw55.sql
-      - name: Install playwright
-        working-directory: custom/plugins/${{ github.event.repository.name }}/tests/acceptance
-        run: |
-          npm ci
-          npx playwright install --with-deps
-#      - name: Run Playwright with reporting
-#        working-directory: custom/plugins/${{ github.event.repository.name }}/tests/acceptance
-#        run: |
-#          npx pwc --project-id ${{ secrets.CURRENTS_PROJECT_ID }} --key ${{ secrets.CURRENTS_RECORD_KEY }} --ci-build-id ${{ github.repository }}-${{ github.run_id }}-${{ matrix.PLATFORM_BRANCH }}-${{ github.run_attempt }}  -- --trace=on
-      - name: Run Playwright
-        working-directory: custom/plugins/${{ github.event.repository.name }}/tests/acceptance
-        run: npx playwright test --trace=on
-      - uses: actions/upload-artifact@v4
-        if: always()
-        with:
-          name: e2e-${{ github.event.repository.name }}-${{ github.sha }}-${{ matrix.PLATFORM_BRANCH }}
-          path: |
-            custom/plugins/${{ github.event.repository.name }}/tests/acceptance/test-results/
-            custom/plugins/${{ github.event.repository.name }}/tests/acceptance/playwright-report/
-          retention-days: 3

.gitignore

@@ -1,15 +1,32 @@
-.idea
-.vscode
-coverage/
-.phpunit.cache
-.phpunit.result.cache
-vendor
-node_modules
-phpstan.neon
+# ide
+.idea/
+.vscode/
+
+# os
+.DS_Store
+
+# node
+node_modules/
 *.hot-update.js
-/var/
+
+# php
+vendor/
+phpstan.neon
 composer.lock
-src/Resources/public/administration/
+.phpunit.cache
+.phpunit.result.cache
+
+# tests
+coverage/
+
+# build
 src/Resources/public/static/
+src/Resources/public/administration/
+src/Resources/app/administration/.tmp
+
+# runtime
+/var/
 .env
+
+# plugin
 /migration_assistant.cache

.php-cs-fixer.dist.php

@@ -13,49 +13,60 @@
     ->setRules([
         '@Symfony' => true,
         '@Symfony:risky' => true,
-        'linebreak_after_opening_tag' => false,
+
         'blank_line_after_opening_tag' => false,
-        'phpdoc_summary' => false,
-        'phpdoc_annotation_without_dot' => false,
-        'phpdoc_to_comment' => false,
+        'class_attributes_separation' => ['elements' => ['property' => 'one', 'method' => 'one']],
+        'concat_space' => ['spacing' => 'one'],
         'declare_strict_types' => true,
-        'strict_comparison' => true,
-        'strict_param' => true,
-        'no_useless_else' => true,
-        'void_return' => true,
-        'phpdoc_line_span' => true,
-        'php_unit_dedicate_assert_internal_type' => true,
-        'php_unit_mock' => true,
-        'php_unit_test_case_static_method_calls' => ['call_type' => 'static'],
-        'no_useless_return' => true,
-        'yoda_style' => [
-            'equal' => false,
-            'identical' => false,
-            'less_and_greater' => false,
-        ],
-        'single_line_throw' => false,
         'fopen_flags' => false,
-        'self_accessor' => false,
-        'phpdoc_align' => ['align' => 'left'],
-        'phpdoc_order' => ['order' => ['param', 'throws', 'return']],
-        'class_attributes_separation' => ['elements' => ['property' => 'one', 'method' => 'one']],
+        'general_phpdoc_annotation_remove' => ['annotations' => ['copyright', 'category']],
+        'linebreak_after_opening_tag' => false,
         'method_argument_space' => ['on_multiline' => 'ensure_fully_multiline'],
-        'concat_space' => ['spacing' => 'one'],
         'native_function_invocation' => [
             'scope' => 'namespaced',
             'strict' => false,
             'exclude' => ['ini_get'],
         ],
-        'general_phpdoc_annotation_remove' => ['annotations' => ['copyright', 'category']],
         'no_superfluous_phpdoc_tags' => ['allow_unused_params' => true, 'allow_mixed' => true],
+        'no_useless_else' => true,
+        'no_useless_return' => true,
+        'ordered_class_elements' => true,
+        'phpdoc_align' => ['align' => 'left'],
+        'phpdoc_annotation_without_dot' => false,
+        'phpdoc_line_span' => true,
+        'phpdoc_order' => ['order' => ['param', 'throws', 'return']],
+        'phpdoc_summary' => false,
+        'phpdoc_to_comment' => false,
         'php_unit_dedicate_assert' => ['target' => 'newest'],
+        'php_unit_dedicate_assert_internal_type' => true,
+        'php_unit_mock' => true,
+        'php_unit_test_case_static_method_calls' => ['methods' => [
+            'any' => 'this',
+            'never' => 'this',
+            'atLeast' => 'this',
+            'atLeastOnce' => 'this',
+            'once' => 'this',
+            'exactly' => 'this',
+            'atMost' => 'this',
+        ]],
+        'self_accessor' => false,
+        'single_line_throw' => false,
         'single_quote' => ['strings_containing_single_quote_chars' => true],
+        'strict_comparison' => true,
+        'strict_param' => true,
+        'trailing_comma_in_multiline' => ['after_heredoc' => true, 'elements' => ['array_destructuring', 'arrays', 'match']],
+        'void_return' => true,
+        'yoda_style' => [
+            'equal' => false,
+            'identical' => false,
+            'less_and_greater' => false,
+        ],
         'header_comment' => ['header' => '(c) shopware AG <info@shopware.com>
 For the full copyright and license information, please view the LICENSE
 file that was distributed with this source code.', 'separate' => 'bottom', 'location' => 'after_declare_strict', 'comment_type' => 'comment'],
     ])
     ->setUsingCache(true)
-    ->setCacheFile(Path::join($_SERVER['SHOPWARE_TOOL_CACHE_ECS'] ?? __DIR__, '/var/cache/php-cs-fixer.cache'))
+    ->setCacheFile(Path::join($_SERVER['SHOPWARE_TOOL_CACHE_ECS'] ?? 'var/cache/cs_fixer', 'cs_fixer.cache'))
     ->setFinder(
         (new Finder())
             ->in([__DIR__ . '/src', __DIR__ . '/tests'])

.prettierignore

@@ -0,0 +1,5 @@
+**/node_modules
+**/static
+**/.tmp
+**/public/
+**/coverage/

.prettierrc.json

@@ -0,0 +1,10 @@
+{
+    "singleQuote": true,
+    "tabWidth": 4,
+    "printWidth": 125,
+    "trailingComma": "all",
+    "multilineArraysWrapThreshold": 1,
+    "plugins": [
+        "prettier-plugin-multiline-arrays"
+    ]
+}